Github messages for voidlinux
 help / color / mirror / Atom feed
From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] Python 3.9
Date: Fri, 09 Oct 2020 20:02:53 +0200	[thread overview]
Message-ID: <20201009180253.-DGTelZgcTZVEVSXt-cQdI7RY0vskbKnkSY1mMy48vM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25413@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages python
https://github.com/void-linux/void-packages/pull/25413

[WIP] Python 3.9
I've moved `python3` and `python3-tkinter` to 3.9.0 and revbumped the 1109 packages that either have an shlib dependency on `python3` or installs files to `usr/lib/python3.8/site-packages`. Of these, I dropped `noarch` from 411 packages.

I'll start build-testing on `x86_64` to identify breakage and report back with problems. In the meantime, anybody with excess computing resources can feel free to try building for other archs.

A patch file from https://github.com/void-linux/void-packages/pull/25413.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-25413.patch --]
[-- Type: text/x-diff, Size: 1253066 bytes --]

From 3da16945c0ea3871d291c6f061e2407dcfb1df9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:27:37 -0400
Subject: [PATCH 0001/1118] python3: update to 3.9.0.

---
 common/environment/setup/python.sh              | 2 +-
 common/hooks/pre-configure/02-script-wrapper.sh | 2 +-
 common/shlibs                                   | 2 +-
 srcpkgs/python3/template                        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index 3469fe070a9..993cf3587a1 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
 py2_sitelib="${py2_lib}/site-packages"
 py2_inc="usr/include/python${py2_ver}"
 
-py3_ver="3.8"
+py3_ver="3.9"
 py3_abiver=""
 py3_lib="usr/lib/python${py3_ver}"
 py3_sitelib="${py3_lib}/site-packages"
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 187e9c6f45f..5e26abfe231 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -209,7 +209,7 @@ hook() {
 	generic_wrapper3 libetpan-config
 	generic_wrapper3 giblib-config
 	python_wrapper python-config 2.7
-	python_wrapper python3-config 3.8
+	python_wrapper python3-config 3.9
 	apr_apu_wrapper apr-1-config
 	apr_apu_wrapper apu-1-config
 }
diff --git a/common/shlibs b/common/shlibs
index 7dad8c2117d..e1e729428d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1779,7 +1779,7 @@ libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
 libdar.so.6000 libdar-2.6.6_1
 libdar64.so.6000 libdar-2.6.6_1
 libpython3.so python3-3.8.0_1
-libpython3.8.so.1.0 python3-3.8.0_1
+libpython3.9.so.1.0 python3-3.9.0_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 85146d8341b..299e64ba76f 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.8.6
+version=3.9.0
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=a9e0b79d27aa056eb9cce8d63a427b5f9bab1465dee3f942dcfdb25a82f4ab8a
+checksum=9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From bcb0971265beb83f54bacd565974db6f7936b619 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:27:53 -0400
Subject: [PATCH 0002/1118] python3-tkinter: update to 3.9.0.

---
 srcpkgs/python3-tkinter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 0957e3632d7..b27d2cacd2d 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -7,7 +7,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.8.6
+version=3.9.0
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="
@@ -22,7 +22,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=a9e0b79d27aa056eb9cce8d63a427b5f9bab1465dee3f942dcfdb25a82f4ab8a
+checksum=9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854
 
 pre_configure() {
 	# Ensure that internal copies of expat and libffi are not used.

From ced124771164e33e6a1dc55863450fab58f08953 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:37 -0400
Subject: [PATCH 0003/1118] Grammalecte: rebuild for Python 3.9, drop noarch

---
 srcpkgs/Grammalecte/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/Grammalecte/template b/srcpkgs/Grammalecte/template
index 00e2bbb34a8..ed8a6b5afb7 100644
--- a/srcpkgs/Grammalecte/template
+++ b/srcpkgs/Grammalecte/template
@@ -1,8 +1,7 @@
 # Template file for 'Grammalecte'
 pkgname=Grammalecte
 version=1.6.0
-revision=1
-archs=noarch
+revision=2
 create_wrksrc=yes
 build_style=python3-module
 hostmakedepends="python3-setuptools bsdtar"

From 9a291b9ba1d5bfcfd1c4c2343ed54e9e722b95f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:37 -0400
Subject: [PATCH 0004/1118] PhotoCollage: rebuild for Python 3.9, drop noarch

---
 srcpkgs/PhotoCollage/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/PhotoCollage/template b/srcpkgs/PhotoCollage/template
index e649885fda0..39c24a430be 100644
--- a/srcpkgs/PhotoCollage/template
+++ b/srcpkgs/PhotoCollage/template
@@ -1,8 +1,7 @@
 # Template file for 'PhotoCollage'
 pkgname=PhotoCollage
 version=1.4.4
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 hostmakedepends="gettext python3"
 depends="python3-Pillow python3-gobject"

From fefa199924df6c6a9f84620d6f912b2f145fdddb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:37 -0400
Subject: [PATCH 0005/1118] Solaar: rebuild for Python 3.9, drop noarch

---
 srcpkgs/Solaar/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
index da77237f898..1ba1c2ea72c 100644
--- a/srcpkgs/Solaar/template
+++ b/srcpkgs/Solaar/template
@@ -1,8 +1,7 @@
 # Template file for 'Solaar'
 pkgname=Solaar
 version=1.0.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyudev"

From 1b176c2ce6e363a89e3474122b693225b29ffde7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:37 -0400
Subject: [PATCH 0006/1118] TwitchNotifier: rebuild for Python 3.9, drop noarch

---
 srcpkgs/TwitchNotifier/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/TwitchNotifier/template b/srcpkgs/TwitchNotifier/template
index 3bbba11db49..d8aa07537ae 100644
--- a/srcpkgs/TwitchNotifier/template
+++ b/srcpkgs/TwitchNotifier/template
@@ -1,12 +1,11 @@
 # Template file for 'TwitchNotifier'
 pkgname=TwitchNotifier
 version=0.5
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel"
 makedepends="python3-devel"
 depends="python3-gobject python3-requests libnotify"
-archs=noarch
 short_desc="Daemon that notifies you about your followed channels on Twitch.TV"
 maintainer="Giedrius Statkevičius <giedriuswork@gmail.com>"
 license="GPL-3"

From babfd0f1317c77cc275db3d998d9e6dda8365caf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:37 -0400
Subject: [PATCH 0007/1118] alienfx: rebuild for Python 3.9, drop noarch

---
 srcpkgs/alienfx/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/alienfx/template b/srcpkgs/alienfx/template
index 62ee564ad4b..5a6bffd3865 100644
--- a/srcpkgs/alienfx/template
+++ b/srcpkgs/alienfx/template
@@ -1,8 +1,7 @@
 # Template file for 'alienfx'
 pkgname=alienfx
 version=2.3.4
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="alienfx"
 hostmakedepends="python3-setuptools"

From 7619c84c205c10705d44f1d7634714800a3132ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:38 -0400
Subject: [PATCH 0008/1118] ansible: rebuild for Python 3.9, drop noarch

---
 srcpkgs/ansible/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 77356f8404a..4c607951d2c 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,8 +1,7 @@
 # Template file for 'ansible'
 pkgname=ansible
 version=2.9.13
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko

From d432dcd32ea9f8c458946093f240ba8060255bd9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:38 -0400
Subject: [PATCH 0009/1118] apparmor: rebuild for Python 3.9, drop noarch

---
 srcpkgs/apparmor/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index cd7073fdcfb..af32beacbf9 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=2.13.4
-revision=2
+revision=3
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
@@ -63,7 +63,6 @@ post_install() {
 }
 
 apparmor-vim_package() {
-	archs=noarch
 	short_desc+=" - Vim syntax"
 	depends="vim"
 	pkg_install() {

From 613178c253b0e75276737578d78242beeeeab8a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:38 -0400
Subject: [PATCH 0010/1118] arandr: rebuild for Python 3.9, drop noarch

---
 srcpkgs/arandr/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/arandr/template b/srcpkgs/arandr/template
index 5e5bd84dd13..ab02261cb79 100644
--- a/srcpkgs/arandr/template
+++ b/srcpkgs/arandr/template
@@ -1,8 +1,7 @@
 # Template file for 'arandr'
 pkgname=arandr
 version=0.1.10
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools python3-docutils"
 depends="python3-gobject xrandr python3"

From 9097519d839cce62a58181e04af7bb5a772992ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:38 -0400
Subject: [PATCH 0011/1118] asciinema: rebuild for Python 3.9, drop noarch

---
 srcpkgs/asciinema/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/asciinema/template b/srcpkgs/asciinema/template
index 38b8871753c..c4f7abc33f5 100644
--- a/srcpkgs/asciinema/template
+++ b/srcpkgs/asciinema/template
@@ -1,8 +1,7 @@
 # Template file for 'asciinema'
 pkgname=asciinema
 version=2.0.2
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="asciinema"
 hostmakedepends="python3-setuptools"

From 1748359bc7c0753596371b6cf946c94368d11d31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:38 -0400
Subject: [PATCH 0012/1118] audit: rebuild for Python 3.9, drop noarch

---
 srcpkgs/audit/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template
index ecd0cbfc44f..3294ac19927 100644
--- a/srcpkgs/audit/template
+++ b/srcpkgs/audit/template
@@ -1,7 +1,7 @@
 # Template file for 'audit'
 pkgname=audit
 version=2.8.5
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5
  --with-apparmor --with-libcap-ng --with-python3"
@@ -34,7 +34,6 @@ post_install() {
 }
 
 libaudit-common_package() {
-	archs=noarch
 	short_desc+=" - Library common files"
 	pkg_install() {
 		vmove etc/libaudit.conf

From 49446e26377da32f67ca105fc972f4b581f94f16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:38 -0400
Subject: [PATCH 0013/1118] autorandr: rebuild for Python 3.9, drop noarch

---
 srcpkgs/autorandr/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/autorandr/template b/srcpkgs/autorandr/template
index b86b81a50ce..593fa5dbcd9 100644
--- a/srcpkgs/autorandr/template
+++ b/srcpkgs/autorandr/template
@@ -1,8 +1,7 @@
 # Template file for 'autorandr'
 pkgname=autorandr
 version=1.10.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"
 depends="python3-setuptools xrandr"

From 30a925541cdadeb37fd96f8c899ab15fe01f1272 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:39 -0400
Subject: [PATCH 0014/1118] avahi-discover: rebuild for Python 3.9, drop noarch

---
 srcpkgs/avahi-discover/template | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 1c4249f1036..1e83d297130 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
 #
 pkgname=avahi-discover
 version=0.8
-revision=2
+revision=3
 wrksrc="avahi-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -80,10 +80,7 @@ do_install() {
 	mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
 	mv ${wrksrc}/tmpinstall/usr/include/avahi-qt* ${DESTDIR}/usr/include
 	mv ${wrksrc}/tmpinstall/usr/include/avahi-libevent* ${DESTDIR}/usr/include
-	mv ${wrksrc}/tmpinstall/usr/lib/python3.8 ${DESTDIR}/usr/lib
-	# Python files are compatible with both 2.7 and 3.x, make both subpackages
-	vmkdir ${py2_lib}
-	vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
+	mv ${wrksrc}/tmpinstall/${py3_lib} ${DESTDIR}/usr/lib
 	mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
 	mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
 	mv ${wrksrc}/tmpinstall/usr/lib/*avahi-qt* ${DESTDIR}/usr/lib
@@ -103,7 +100,6 @@ do_install() {
 avahi-python3-utils_package() {
 	depends="avahi-python3>=${version}_${revision}"
 	short_desc="Avahi python utilities"
-	archs=noarch
 	python_version=3
 	pkg_install() {
 		vmove usr/bin/avahi-bookmarks
@@ -114,25 +110,14 @@ avahi-python3-utils_package() {
 avahi-python-utils_package() {
 	short_desc="Avahi python utilities - transitional dummy pkg"
 	depends="avahi-python3-utils>=${version}_${revision}"
-	archs=noarch
 	build_style=meta
 }
 
-avahi-python_package() {
-	depends="python-dbus"
-	short_desc="Python utility package for Avahi"
-	archs=noarch
-	pkg_install() {
-		vmove ${py2_sitelib}/avahi
-	}
-}
-
 avahi-python3_package() {
 	depends="python3-dbus"
 	short_desc="Python3 utility package for Avahi"
-	archs=noarch
 	pkg_install() {
-		vmove ${py3_sitelib}/avahi
+		vmove ${py3_sitelib}
 	}
 }
 

From 9dfdd7f252b65215859e2354649216c451414da4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:39 -0400
Subject: [PATCH 0015/1118] avideo: rebuild for Python 3.9, drop noarch

---
 srcpkgs/avideo/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/avideo/template b/srcpkgs/avideo/template
index af1491295da..17637289aac 100644
--- a/srcpkgs/avideo/template
+++ b/srcpkgs/avideo/template
@@ -1,8 +1,7 @@
 # Template file for 'avideo'
 pkgname=avideo
 version=2017.9.27
-revision=5
-archs=noarch
+revision=6
 wrksrc="avideo"
 build_style=python3-module
 hostmakedepends="python3"

From c7445d33a283afd16f172f0c1349080158f5bc33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:39 -0400
Subject: [PATCH 0016/1118] aws-cli: rebuild for Python 3.9, drop noarch

---
 srcpkgs/aws-cli/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 9be0830952e..8ead2d8ff4a 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,8 +1,7 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
 version=1.18.125
-revision=1
-archs=noarch
+revision=2
 wrksrc="aws-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6a06600c902d21416ffa16113378673e0d9a5682 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:39 -0400
Subject: [PATCH 0017/1118] azote: rebuild for Python 3.9, drop noarch

---
 srcpkgs/azote/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template
index 9b5756804ea..91df1ef8956 100644
--- a/srcpkgs/azote/template
+++ b/srcpkgs/azote/template
@@ -1,8 +1,7 @@
 # Template file for 'azote'
 pkgname=azote
 version=1.7.10
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3>=3.4 python3-setuptools python3-gobject python3-Pillow gtk+3 feh python3-send2trash xrandr grim slurp ImageMagick python3-yaml"

From 6305e0c30dd1f24adafef5412fa2325bc533af99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:39 -0400
Subject: [PATCH 0018/1118] bCNC: rebuild for Python 3.9, drop noarch

---
 srcpkgs/bCNC/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bCNC/template b/srcpkgs/bCNC/template
index 2e715c512a9..97abf12b4f7 100644
--- a/srcpkgs/bCNC/template
+++ b/srcpkgs/bCNC/template
@@ -1,8 +1,7 @@
 # Template file for 'bCNC'
 pkgname=bCNC
 version=0.9.14.306
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy"

From ed864bf461dff959f8d11c52be99dd441f4c5464 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:39 -0400
Subject: [PATCH 0019/1118] bandit: rebuild for Python 3.9, drop noarch

---
 srcpkgs/bandit/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bandit/template b/srcpkgs/bandit/template
index d29873ecf61..93e6b77aa6b 100644
--- a/srcpkgs/bandit/template
+++ b/srcpkgs/bandit/template
@@ -1,8 +1,7 @@
 # Template file for 'bandit'
 pkgname=bandit
 version=1.6.2
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="bandit"
 hostmakedepends="python3-setuptools"

From b03c39800d7eb916dea3001180231d9e0c8f559a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:40 -0400
Subject: [PATCH 0020/1118] beets: rebuild for Python 3.9, drop noarch

---
 srcpkgs/beets/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index bf0240f1f54..8dfb44bf88a 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,8 +1,7 @@
 # Template file for 'beets'
 pkgname=beets
 version=1.4.9
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-munkres python3-musicbrainzngs

From 7ec04dfb5cd1cb9c49abe59b6d0f8a001bbd13ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:40 -0400
Subject: [PATCH 0021/1118] binwalk: rebuild for Python 3.9, drop noarch

---
 srcpkgs/binwalk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index fccd523d584..fa2328e7ae0 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,8 +1,7 @@
 # Template file for 'binwalk'
 pkgname=binwalk
 version=2.2.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="binwalk"
 hostmakedepends="python3"

From db661dcb56cbf050c15fce457c448ba5ae5ab149 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:40 -0400
Subject: [PATCH 0022/1118] black: rebuild for Python 3.9, drop noarch

---
 srcpkgs/black/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index ab7bf23c85e..c29842f2805 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,8 +1,7 @@
 # Template file for 'black'
 pkgname=black
 version=19.10b0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="black.py blib2to3 _black_version.py"
 hostmakedepends="git python3-setuptools"

From 7bb78c1a640fac32ab4d582fa332c4d2d6cd4190 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:40 -0400
Subject: [PATCH 0023/1118] borgmatic: rebuild for Python 3.9, drop noarch

---
 srcpkgs/borgmatic/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 9ca5df9724f..83c1a0ed2d6 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,8 +1,7 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
 version=1.5.8
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="borg python3-setuptools python3-ruamel.yaml python3-pykwalify

From 1b7665e34accd75c3d4467ea1d5e6d0843534643 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:40 -0400
Subject: [PATCH 0024/1118] btrfs-backup: rebuild for Python 3.9, drop noarch

---
 srcpkgs/btrfs-backup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/btrfs-backup/template b/srcpkgs/btrfs-backup/template
index 55a3800a857..061a8af95c1 100644
--- a/srcpkgs/btrfs-backup/template
+++ b/srcpkgs/btrfs-backup/template
@@ -1,9 +1,8 @@
 # Template file for 'btrfs-backup'
 pkgname=btrfs-backup
 version=0.3.1
-revision=2
+revision=3
 wrksrc="${pkgname/-/_}-${version}"
-archs=noarch
 build_style=python3-module
 pycompile_module="${pkgname/-/_}"
 hostmakedepends="python3-setuptools"

From c2951a3580dafc09d6820dfc0e59c3e27c952ac6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:41 -0400
Subject: [PATCH 0025/1118] bum: rebuild for Python 3.9, drop noarch

---
 srcpkgs/bum/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template
index 20f200e74d6..dd8f302132f 100644
--- a/srcpkgs/bum/template
+++ b/srcpkgs/bum/template
@@ -1,8 +1,7 @@
 # Template file for 'bum'
 pkgname=bum
 version=0.1.3
-revision=4
-archs=noarch
+revision=5
 build_style=python3-module
 pycompile_module="bum"
 hostmakedepends="python3-setuptools"

From a6e8c6a0337755d732c419095b7043250952f1a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:41 -0400
Subject: [PATCH 0026/1118] caffeine-ng: rebuild for Python 3.9, drop noarch

---
 srcpkgs/caffeine-ng/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template
index 455b2f225c4..b2b48278913 100644
--- a/srcpkgs/caffeine-ng/template
+++ b/srcpkgs/caffeine-ng/template
@@ -1,8 +1,7 @@
 # Template file for 'caffeine-ng'
 pkgname=caffeine-ng
 version=3.4.2
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="caffeine"
 hostmakedepends="python3-setuptools"

From cb97a471a699070912f41e7f48bc22d3648d63bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:41 -0400
Subject: [PATCH 0027/1118] canto-next: rebuild for Python 3.9, drop noarch

---
 srcpkgs/canto-next/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index fa28bde891b..03eb9deb18e 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,8 +1,7 @@
 # Template file for 'canto-next'
 pkgname=canto-next
 version=0.9.7
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-feedparser"

From cc38138bacdf1a503b3e8e396e4ca3c0d66e49e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:41 -0400
Subject: [PATCH 0028/1118] castero: rebuild for Python 3.9, drop noarch

---
 srcpkgs/castero/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/castero/template b/srcpkgs/castero/template
index 2d6c421eee3..1574318916a 100644
--- a/srcpkgs/castero/template
+++ b/srcpkgs/castero/template
@@ -1,8 +1,7 @@
 # Template file for 'castero'
 pkgname=castero
 version=0.8.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-cjkwrap

From 76f23c6590e1184adbdbfbf188313b6f6f038d2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:41 -0400
Subject: [PATCH 0029/1118] catfish: rebuild for Python 3.9, drop noarch

---
 srcpkgs/catfish/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template
index 38df0a0adef..9eeb322b2e0 100644
--- a/srcpkgs/catfish/template
+++ b/srcpkgs/catfish/template
@@ -1,8 +1,7 @@
 # Template file for 'catfish'
 pkgname=catfish
 version=1.4.13
-revision=2
-archs=noarch
+revision=3
 wrksrc="catfish-catfish-${version}"
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-gobject"

From 8eb80f4b963ea0b6de8ca867cdefe83748afd67a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:42 -0400
Subject: [PATCH 0030/1118] ccsm: rebuild for Python 3.9, drop noarch

---
 srcpkgs/ccsm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ccsm/template b/srcpkgs/ccsm/template
index bda81960c5a..7f27e3317fc 100644
--- a/srcpkgs/ccsm/template
+++ b/srcpkgs/ccsm/template
@@ -1,8 +1,7 @@
 # Template file for 'ccsm'
 pkgname=ccsm
 version=0.8.18
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="automake intltool libtool pkg-config python3"
 makedepends="compiz-core-devel compizconfig-python python3-cairo-devel pygtk-devel"

From ee31595acc644d38ddf6b72ddfd4ae88481cae38 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:42 -0400
Subject: [PATCH 0031/1118] coccigrep: rebuild for Python 3.9, drop noarch

---
 srcpkgs/coccigrep/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/coccigrep/template b/srcpkgs/coccigrep/template
index 8c45bc12fa4..0b4e37bf590 100644
--- a/srcpkgs/coccigrep/template
+++ b/srcpkgs/coccigrep/template
@@ -1,8 +1,7 @@
 # Template file for 'coccigrep'
 pkgname=coccigrep
 version=1.20
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="coccinelle python3-Pygments"

From 712f516df723436ef82429b4990d9d7258c22ec1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:42 -0400
Subject: [PATCH 0032/1118] coursera-dl: rebuild for Python 3.9, drop noarch

---
 srcpkgs/coursera-dl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template
index 4609573f7f4..a484d1a54a0 100644
--- a/srcpkgs/coursera-dl/template
+++ b/srcpkgs/coursera-dl/template
@@ -1,8 +1,7 @@
 # Template file for 'coursera-dl'
 pkgname=coursera-dl
 version=0.11.5
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="coursera"
 hostmakedepends="python3-setuptools"

From b7c6f648d7ea9beaa87e6ce4e6558eb22c59dcae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:42 -0400
Subject: [PATCH 0033/1118] cpuset: rebuild for Python 3.9, drop noarch

---
 srcpkgs/cpuset/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cpuset/template b/srcpkgs/cpuset/template
index 12b54631617..b1675ff9cda 100644
--- a/srcpkgs/cpuset/template
+++ b/srcpkgs/cpuset/template
@@ -1,8 +1,7 @@
 # Template file for 'cpuset'
 pkgname=cpuset
 version=1.6
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="cpuset"
 hostmakedepends="python3-setuptools"

From fb1ffdec9788e0fb905f9324044b43e16817b4ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:42 -0400
Subject: [PATCH 0034/1118] ctop: rebuild for Python 3.9, drop noarch

---
 srcpkgs/ctop/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ctop/template b/srcpkgs/ctop/template
index 5231b4a4cb3..9646c772b76 100644
--- a/srcpkgs/ctop/template
+++ b/srcpkgs/ctop/template
@@ -1,8 +1,7 @@
 # Template file for 'ctop'
 pkgname=ctop
 version=1.0.0
-revision=4
-archs=noarch
+revision=5
 build_style=python3-module
 pycompile_module="cgroup_top.py"
 hostmakedepends="python3-setuptools"

From 5ae3e8aa0f4fe8af0e82ac8b6adf847cffbd2dd0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:43 -0400
Subject: [PATCH 0035/1118] curseradio: rebuild for Python 3.9, drop noarch

---
 srcpkgs/curseradio/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/curseradio/template b/srcpkgs/curseradio/template
index f5afe3bba34..d3f05ee1d5f 100644
--- a/srcpkgs/curseradio/template
+++ b/srcpkgs/curseradio/template
@@ -1,8 +1,7 @@
 # Template file for 'curseradio'
 pkgname=curseradio
 version=0.0.20171017
-revision=4
-archs=noarch
+revision=5
 _commit=1bd4bd0faeec675e0647bac9a100b526cba19f8d
 wrksrc="curseradio-${_commit}"
 build_style=python3-module

From fd62d1b31c819889511876dfb7a8e19873eee16c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:43 -0400
Subject: [PATCH 0036/1118] d-feet: rebuild for Python 3.9, drop noarch

---
 srcpkgs/d-feet/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/d-feet/template b/srcpkgs/d-feet/template
index beac13b35c3..8983725501f 100644
--- a/srcpkgs/d-feet/template
+++ b/srcpkgs/d-feet/template
@@ -1,8 +1,7 @@
 # Template file for 'd-feet'
 pkgname=d-feet
 version=0.3.15
-revision=3
-archs=noarch
+revision=4
 build_style=meson
 pycompile_module="dfeet"
 hostmakedepends="pkg-config intltool itstool python3-pycodestyle"

From 9c28801d375c8fa2731908dcea46ef1ca1a57d51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:43 -0400
Subject: [PATCH 0037/1118] deluge: rebuild for Python 3.9, drop noarch

---
 srcpkgs/deluge/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 9eca5e10f08..15d7fc5ebd9 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,8 +1,7 @@
 # Template file for 'deluge'
 pkgname=deluge
 version=2.0.3
-revision=7
-archs=noarch
+revision=8
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
@@ -27,7 +26,6 @@ post_install() {
 }
 
 deluge-gtk_package() {
-	archs=noarch
 	replaces="deluge<1.3.14_1"
 	short_desc+=" - GTK+ frontend"
 	depends="${sourcepkg}-${version}_${revision} python3-gobject"
@@ -42,7 +40,6 @@ deluge-gtk_package() {
 	}
 }
 deluge-web_package() {
-	archs=noarch
 	replaces="deluge<1.3.14_1"
 	short_desc+=" - Web frontend"
 	depends="${sourcepkg}-${version}_${revision}"

From aca185264cf1e04a664553d424b3c3e147c8db8e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:43 -0400
Subject: [PATCH 0038/1118] devedeng: rebuild for Python 3.9, drop noarch

---
 srcpkgs/devedeng/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index e3bb19e3fc8..685ac743544 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,8 +1,7 @@
 # Template file for 'devedeng'
 pkgname=devedeng
 version=4.16.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="devedeng"
 hostmakedepends="gettext python3"

From 7e1af14e2ac3d634bf16074ba08b7dec58e0a30c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:43 -0400
Subject: [PATCH 0039/1118] downloader-cli: rebuild for Python 3.9, drop noarch

---
 srcpkgs/downloader-cli/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index 2e5b1ed2d59..f406399f0dd 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,8 +1,7 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
 version=0.2.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"

From f0646ece945a70660e026cb6a7d6f0fd9d21c19b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:43 -0400
Subject: [PATCH 0040/1118] duiadns: rebuild for Python 3.9, drop noarch

---
 srcpkgs/duiadns/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/duiadns/template b/srcpkgs/duiadns/template
index ae34b00cb95..cb447d33cdf 100644
--- a/srcpkgs/duiadns/template
+++ b/srcpkgs/duiadns/template
@@ -1,8 +1,7 @@
 # Template file for 'duiadns'
 pkgname=duiadns
 version=1.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-netaddr python3-requests"

From 3c3b2c5f23c5fdb2796a3c98f28ea3b95fd8c140 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:44 -0400
Subject: [PATCH 0041/1118] edx-dl: rebuild for Python 3.9, drop noarch

---
 srcpkgs/edx-dl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/edx-dl/template b/srcpkgs/edx-dl/template
index 1ea89343e7a..5e1f8b2c2da 100644
--- a/srcpkgs/edx-dl/template
+++ b/srcpkgs/edx-dl/template
@@ -1,8 +1,7 @@
 # Template file for 'edx-dl'
 pkgname=edx-dl
 version=0.1.13
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-html5lib python3-setuptools

From 1aefaad69810378ba31a02307dd39f9be43278f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:44 -0400
Subject: [PATCH 0042/1118] electrum: rebuild for Python 3.9, drop noarch

---
 srcpkgs/electrum/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 835fbf25533..5c3016675e5 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,8 +1,7 @@
 # Template file for 'electrum'
 pkgname=electrum
 version=3.3.8
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="electrum electrum_gui electrum_plugins"
 hostmakedepends="python3-PyQt5-devel-tools python3-setuptools"

From c9110f55933468b8e5185d5aedcfb02cb6cea14c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:44 -0400
Subject: [PATCH 0043/1118] electrum-ltc: rebuild for Python 3.9, drop noarch

---
 srcpkgs/electrum-ltc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/electrum-ltc/template b/srcpkgs/electrum-ltc/template
index 550fda484e6..a9a629a057e 100644
--- a/srcpkgs/electrum-ltc/template
+++ b/srcpkgs/electrum-ltc/template
@@ -1,8 +1,7 @@
 # Template file for 'electrum-ltc'
 pkgname=electrum-ltc
 version=3.3.8.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
 depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx

From 88db008e0bc98cde04fa291d42c55a52b8fb4285 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:44 -0400
Subject: [PATCH 0044/1118] eyeD3: rebuild for Python 3.9, drop noarch

---
 srcpkgs/eyeD3/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template
index ee7f68f9e36..c37f3c0f0c6 100644
--- a/srcpkgs/eyeD3/template
+++ b/srcpkgs/eyeD3/template
@@ -1,8 +1,7 @@
 # Template file for 'eyeD3'
 pkgname=eyeD3
 version=0.9.5
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-grako python3-pylast python3-setuptools python3-deprecation
@@ -12,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://eyed3.readthedocs.io/en/latest/"
 changelog="https://raw.githubusercontent.com/nicfit/eyeD3/master/HISTORY.rst"
-distfiles="https://eyed3.nicfit.net/releases/${pkgname}-${version}.tar.gz"
-checksum=faf5806197f2093e82c2830d41f2378f07b3a9da07a16fafb14fc6fbdebac50a
+distfiles="https://github.com/nicfit/eyeD3/archive/v${version}.tar.gz"
+checksum=a0df2d2e7d366514f44bc553f723e92aa4bdd3f5fb1e5118e228dc9cd3ff6ff3

From 1fbce073a9123ae09409310cbfa0ecadc0b89ad1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:44 -0400
Subject: [PATCH 0045/1118] fail2ban: rebuild for Python 3.9, drop noarch

---
 srcpkgs/fail2ban/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template
index cde2f25630f..2b8fe877a8b 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,8 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
 version=0.11.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"

From 9ad84aaf6edc83aee5a0018ebcb84e2d463563b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:44 -0400
Subject: [PATCH 0046/1118] fava: rebuild for Python 3.9, drop noarch

---
 srcpkgs/fava/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index 44628c261d2..03da130b158 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,8 +1,7 @@
 # Template file for 'fava'
 pkgname=fava
 version=1.15
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask

From 080f8fd154f9f3ed98ab9253c1eaed6ae615eab2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:45 -0400
Subject: [PATCH 0047/1118] fierce: rebuild for Python 3.9, drop noarch

---
 srcpkgs/fierce/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template
index 1d395274898..31e4741929e 100644
--- a/srcpkgs/fierce/template
+++ b/srcpkgs/fierce/template
@@ -1,8 +1,7 @@
 # Template file for 'fierce'
 pkgname=fierce
 version=1.4.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="fierce"
 hostmakedepends="python3-setuptools"

From c1f063404fda999041e2481ff7e38332d1fd9b6a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:45 -0400
Subject: [PATCH 0048/1118] flake8: rebuild for Python 3.9, drop noarch

---
 srcpkgs/flake8/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template
index 3601b101b66..da71302508c 100644
--- a/srcpkgs/flake8/template
+++ b/srcpkgs/flake8/template
@@ -1,8 +1,7 @@
 # Template file for 'flake8'
 pkgname=flake8
 version=3.8.3
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-pycodestyle>=2.6.0<2.7.0
@@ -24,7 +23,6 @@ post_install() {
 }
 
 python3-flake8_package() {
-	archs=noarch
 	build_style=meta
 	short_desc+=" (transitional dummy package)"
 	depends="flake8>=${version}_${revision}"

From e10315d31f1427c4d1f8510dde0d70b6b883ec8e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:45 -0400
Subject: [PATCH 0049/1118] flinks: rebuild for Python 3.9, drop noarch

---
 srcpkgs/flinks/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template
index 780aead102c..551b119289d 100644
--- a/srcpkgs/flinks/template
+++ b/srcpkgs/flinks/template
@@ -1,8 +1,7 @@
 # Template file for 'flinks'
 pkgname=flinks
 version=0.4.3
-revision=5
-archs=noarch
+revision=6
 build_style=python3-module
 pycompile_module="flinkspkg"
 hostmakedepends="python3-setuptools"

From 353efe143b47bb65537abee669ecf06098e64cf4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:45 -0400
Subject: [PATCH 0050/1118] gallery-dl: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gallery-dl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 2a361f53274..36be82bc464 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,8 +1,7 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
 version=1.14.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-setuptools"

From f357bffdc008f4d1a3f910b2ba7c99f5ecf0a384 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:45 -0400
Subject: [PATCH 0051/1118] gandi-cli: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gandi-cli/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gandi-cli/template b/srcpkgs/gandi-cli/template
index fc6d3ba3320..a861f3b2140 100644
--- a/srcpkgs/gandi-cli/template
+++ b/srcpkgs/gandi-cli/template
@@ -1,8 +1,7 @@
 # Template file for 'gandi-cli'
 pkgname=gandi-cli
 version=1.5
-revision=2
-archs=noarch
+revision=3
 wrksrc="gandi.cli-${version}"
 build_style=python3-module
 pycompile_module="gandi/cli"

From b763a7c385dadbfe367ebebbab6dbc3c852c9995 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:45 -0400
Subject: [PATCH 0052/1118] gcovr: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gcovr/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gcovr/template b/srcpkgs/gcovr/template
index a6b8de8f0cc..06dec001cf5 100644
--- a/srcpkgs/gcovr/template
+++ b/srcpkgs/gcovr/template
@@ -1,8 +1,7 @@
 # Template file for 'gcovr'
 pkgname=gcovr
 version=4.2
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="gcovr"
 hostmakedepends="python3-setuptools"

From afed84e02e89dde4a7998e7285d715bc5ab66a95 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:46 -0400
Subject: [PATCH 0053/1118] git-cola: rebuild for Python 3.9, drop noarch

---
 srcpkgs/git-cola/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template
index bddc3f3fabd..2754ba6be4f 100644
--- a/srcpkgs/git-cola/template
+++ b/srcpkgs/git-cola/template
@@ -1,8 +1,7 @@
 # Template file for 'git-cola'
 pkgname=git-cola
 version=3.7
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_dirs="usr/share/git-cola/lib"
 hostmakedepends="python3"

From ff153298583a768d0fce66db068419d3969d4f2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:46 -0400
Subject: [PATCH 0054/1118] git-filter-repo: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/git-filter-repo/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/git-filter-repo/template b/srcpkgs/git-filter-repo/template
index 321464c7159..cc609004ea7 100644
--- a/srcpkgs/git-filter-repo/template
+++ b/srcpkgs/git-filter-repo/template
@@ -1,8 +1,7 @@
 # Template file for 'git-filter-repo'
 pkgname=git-filter-repo
 version=2.27.0
-revision=1
-archs=noarch
+revision=2
 depends="git python3"
 checkdepends="git python3 perl rsync dos2unix"
 short_desc="Versatile tool for rewriting git history"

From 2ad97bfd4e00aa52aee35ec6dc9e30fb0fabec3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:46 -0400
Subject: [PATCH 0055/1118] git-review: rebuild for Python 3.9, drop noarch

---
 srcpkgs/git-review/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template
index 0ade5e3c4f2..5993feca102 100644
--- a/srcpkgs/git-review/template
+++ b/srcpkgs/git-review/template
@@ -1,8 +1,7 @@
 # Template file for 'git-review'
 pkgname=git-review
 version=1.28.0
-revision=4
-archs=noarch
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"
 depends="python3-requests"

From 46c5dd102b1f1c866741ecd54cfbfd7198b2931d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:46 -0400
Subject: [PATCH 0056/1118] git-revise: rebuild for Python 3.9, drop noarch

---
 srcpkgs/git-revise/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template
index 6d3071429b9..7dcf2bd5615 100644
--- a/srcpkgs/git-revise/template
+++ b/srcpkgs/git-revise/template
@@ -1,8 +1,7 @@
 # Template file for 'git-revise'
 pkgname=git-revise
 version=0.6.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="git python3-setuptools"

From abb2f2ad96e00ba1013fc9c760cbfafc9bfd9075 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:46 -0400
Subject: [PATCH 0057/1118] glances: rebuild for Python 3.9, drop noarch

---
 srcpkgs/glances/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index daeec2ddd7d..4aa28b55cd2 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,8 +1,7 @@
 # Template file for 'glances'
 pkgname=glances
 version=3.1.4.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends} python3-future python3-psutil"

From 67b757ffbf0e1b551a9fffc9922fff881930f0c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:47 -0400
Subject: [PATCH 0058/1118] gnome-passwordsafe: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/gnome-passwordsafe/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index c4609214612..45549e0b60d 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -1,8 +1,7 @@
 # Template file for 'gnome-passwordsafe'
 pkgname=gnome-passwordsafe
 version=3.99.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="PasswordSafe-${version}"
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gobject-introspection python3-pykeepass"

From 2b4912bfb14e025c5dbb0676e5726d091a947df1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:47 -0400
Subject: [PATCH 0059/1118] gnome-tweaks: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gnome-tweaks/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template
index 557005fad57..331ebac65ca 100644
--- a/srcpkgs/gnome-tweaks/template
+++ b/srcpkgs/gnome-tweaks/template
@@ -1,8 +1,7 @@
 # Template file for 'gnome-tweaks'
 pkgname=gnome-tweaks
 version=3.34.0
-revision=3
-archs=noarch
+revision=4
 build_style=meson
 hostmakedepends="gettext"
 depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy"
@@ -15,7 +14,6 @@ checksum=003326fab46e6faad9485924bca503f0c583e3b4553d6f673406eda396205250
 replaces="gnome-tweak-tool>=0"
 
 gnome-tweak-tool_package() {
-	archs=noarch
 	build_style=meta
 	depends="gnome-tweaks>=${version}_${revision}"
 	short_desc+=" (transitional dummy package)"

From 8580967cc05d1e4203bc25ccf0258347a07c61be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:47 -0400
Subject: [PATCH 0060/1118] gns3-gui: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gns3-gui/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 9ea3c9b78ad..0dff36e945d 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,8 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.10
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema python3-sentry

From 9b51275c640b521f28566cac80813cbb571af498 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:47 -0400
Subject: [PATCH 0061/1118] gns3-net-converter: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/gns3-net-converter/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-net-converter/template b/srcpkgs/gns3-net-converter/template
index 70b6c90e8c8..3f638386cf5 100644
--- a/srcpkgs/gns3-net-converter/template
+++ b/srcpkgs/gns3-net-converter/template
@@ -1,8 +1,7 @@
 # Template file for 'gns3-net-converter'
 pkgname=gns3-net-converter
 version=1.3.0
-revision=4
-archs=noarch
+revision=5
 build_style=python3-module
 pycompile_module="gns3converter"
 hostmakedepends="python3-setuptools"

From e91e05a0c0d5ad8bb889ab1f2bb47ac2bb9d2342 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:47 -0400
Subject: [PATCH 0062/1118] gnuradio: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gnuradio/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 8c7c6e80eee..b9239141800 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio'.
 pkgname=gnuradio
 version=3.8.0.0
-revision=4
+revision=5
 build_style=cmake
 conf_files="/etc/gnuradio/conf.d/*"
 configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
@@ -31,7 +31,6 @@ post_install() {
 
 gnuradio-doc_package() {
 	short_desc+=" - documentation"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc
 	}

From 1b776a37bdf946d4387d8d31c47a46acc78d00a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:48 -0400
Subject: [PATCH 0063/1118] gpodder: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gpodder/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template
index 8ce466aaa83..c898e9c3a54 100644
--- a/srcpkgs/gpodder/template
+++ b/srcpkgs/gpodder/template
@@ -1,8 +1,7 @@
 # Template file for 'gpodder'
 pkgname=gpodder
 version=3.10.16
-revision=1
-archs=noarch
+revision=2
 wrksrc="gpodder-${version}"
 hostmakedepends="python3 intltool"
 depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject

From 1933d90aba6f0daa1cf38ffec1f79488992c477a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:48 -0400
Subject: [PATCH 0064/1118] gramps: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gramps/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template
index 35e3245ef62..9fa8eeb622e 100644
--- a/srcpkgs/gramps/template
+++ b/srcpkgs/gramps/template
@@ -1,8 +1,7 @@
 # Template file for 'gramps'
 pkgname=gramps
 version=5.1.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config intltool python3"
 depends="gtk+3 python3-gobject python3-bsddb3"

From 747d4cb81062c0e1279b875451b7946c677804b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:48 -0400
Subject: [PATCH 0065/1118] greg: rebuild for Python 3.9, drop noarch

---
 srcpkgs/greg/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/greg/template b/srcpkgs/greg/template
index 237e2ac9ae9..4900eb02877 100644
--- a/srcpkgs/greg/template
+++ b/srcpkgs/greg/template
@@ -1,8 +1,7 @@
 # Template file for 'greg'
 pkgname=greg
 version=0.4.7
-revision=6
-archs=noarch
+revision=7
 build_style=python3-module
 pycompile_module="greg"
 hostmakedepends="python3-setuptools"

From 020716a7a5cbd456a57e1043886c181280ac256a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:48 -0400
Subject: [PATCH 0066/1118] grip: rebuild for Python 3.9, drop noarch

---
 srcpkgs/grip/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 mode change 100755 => 100644 srcpkgs/grip/template

diff --git a/srcpkgs/grip/template b/srcpkgs/grip/template
old mode 100755
new mode 100644
index 6acfe00b299..d305add95a9
--- a/srcpkgs/grip/template
+++ b/srcpkgs/grip/template
@@ -1,8 +1,7 @@
 # Template file for 'grip'
 pkgname=grip
 version=4.5.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-docopt python3-Flask python3-Markdown python3-path-and-address python3-Pygments python3-requests"

From b36392931d756a3c55e86b261ea5887601386674 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:48 -0400
Subject: [PATCH 0067/1118] gscreenshot: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gscreenshot/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template
index 5537910592e..524ef0918eb 100644
--- a/srcpkgs/gscreenshot/template
+++ b/srcpkgs/gscreenshot/template
@@ -1,8 +1,7 @@
 # Template file for 'gscreenshot'
 pkgname=gscreenshot
 version=2.12.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="gtk+3 python3-setuptools python3-Pillow python3-gobject scrot"

From 1057acc9442bd147f3b9b856a764a4c2ff2084bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:48 -0400
Subject: [PATCH 0068/1118] guake: rebuild for Python 3.9, drop noarch

---
 srcpkgs/guake/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template
index 885fed99f0b..ae5192edb0f 100644
--- a/srcpkgs/guake/template
+++ b/srcpkgs/guake/template
@@ -1,8 +1,7 @@
 # Template file for 'guake'
 pkgname=guake
 version=3.6.3
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 wrksrc="Guake-${version}"
 pycompile_module="guake"

From 850eaa002dfd69a690a7e9896508f195da229bed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:49 -0400
Subject: [PATCH 0069/1118] gufw: rebuild for Python 3.9, drop noarch

---
 srcpkgs/gufw/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gufw/template b/srcpkgs/gufw/template
index 1b87f809fe9..f676cfaf762 100644
--- a/srcpkgs/gufw/template
+++ b/srcpkgs/gufw/template
@@ -1,8 +1,7 @@
 # Template file for 'gufw'
 pkgname=gufw
 version=20.04.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="gufw-${version}"
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool"

From c35cfdc422c83055decd669c6d0936b1dc97327b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:49 -0400
Subject: [PATCH 0070/1118] icdiff: rebuild for Python 3.9, drop noarch

---
 srcpkgs/icdiff/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 396448b86f4..77ed89b2598 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,9 +1,8 @@
 # Template file for 'icdiff'
 pkgname=icdiff
 version=1.9.5
-revision=2
+revision=3
 wrksrc="${pkgname}-release-${version}"
-archs=noarch
 build_style=python-module
 pycompile_module="icdiff.py"
 hostmakedepends="python-setuptools python3-setuptools"
@@ -25,7 +24,6 @@ post_install() {
 }
 
 python3-icdiff_package() {
-	archs=noarch
 	depends="python3 python3-setuptools"
 	pycompile_module="icdiff.py"
 	alternatives="

From 438791fdaa2686c5227b93f62ed82a8a38d43247 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:49 -0400
Subject: [PATCH 0071/1118] jrnl: rebuild for Python 3.9, drop noarch

---
 srcpkgs/jrnl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template
index b184ef09508..1b8392991e0 100644
--- a/srcpkgs/jrnl/template
+++ b/srcpkgs/jrnl/template
@@ -1,8 +1,7 @@
 # Template file for 'jrnl'
 pkgname=jrnl
 version=1.9.8
-revision=4
-archs=noarch
+revision=5
 build_style=python3-module
 pycompile_module="jrnl"
 hostmakedepends="python3-setuptools"

From 2d8916e55564e466f17f82fb07232405f53ff57d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:49 -0400
Subject: [PATCH 0072/1118] khal: rebuild for Python 3.9, drop noarch

---
 srcpkgs/khal/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index c5d3a165d1b..361776c7bfb 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,8 +1,7 @@
 # Template file for 'khal'
 pkgname=khal
 version=0.10.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-click python3-click-log python3-configobj

From c1b6d094d2f3affc7cd228795a17b9fad0021f1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:49 -0400
Subject: [PATCH 0073/1118] khard: rebuild for Python 3.9, drop noarch

---
 srcpkgs/khard/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template
index 70f246cfb40..da57783e4e6 100644
--- a/srcpkgs/khard/template
+++ b/srcpkgs/khard/template
@@ -1,8 +1,7 @@
 # Template file for 'khard'
 pkgname=khard
 version=0.17.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-atomicwrites python3-configobj

From 7ff16f64e533ac9de92400cb8e04b1ab0777a91f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:50 -0400
Subject: [PATCH 0074/1118] libsearpc: rebuild for Python 3.9, drop noarch

---
 srcpkgs/libsearpc/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 1aed9159ab9..625672ca4d5 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
 version=3.2.0
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_module="pysearpc"
 configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
@@ -13,7 +13,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=c479d85e405674c3450eac040abe143af5a9fafe7f1b74926e2a05280ab5420e
+checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
 python_version=3
 
 pre_configure() {
@@ -39,7 +39,6 @@ libsearpc-codegen_package() {
 	short_desc+=" - code generator"
 	depends="python3"
 	python_version=3
-	archs=noarch
 	pkg_install() {
 		vdoc AUTHORS
 		vdoc README.markdown
@@ -51,7 +50,6 @@ libsearpc-python3_package() {
 	short_desc+=" - Python3 bindings"
 	pycompile_module="pysearpc"
 	depends="python3"
-	archs=noarch
 	pkg_install() {
 		vmove usr/lib/python3*
 	}

From 9ea03063bf6c1840f1fbdacb427f0291954d17a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:50 -0400
Subject: [PATCH 0075/1118] llvm10: rebuild for Python 3.9, drop noarch

---
 srcpkgs/llvm10/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/llvm10/template b/srcpkgs/llvm10/template
index 9298c68022d..bfbddb48127 100644
--- a/srcpkgs/llvm10/template
+++ b/srcpkgs/llvm10/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm10'
 pkgname=llvm10
 version=10.0.0
-revision=5
+revision=6
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="
@@ -189,7 +189,6 @@ do_install() {
 }
 
 clang-analyzer_package() {
-	archs=noarch
 	pycompile_dirs="usr/share/scan-view"
 	depends="clang-${version}_${revision} python3"
 	short_desc+=" - A source code analysis framework"

From 1ba96a7a0afdeb060d6941260d1167be7a5fa7de Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:50 -0400
Subject: [PATCH 0076/1118] lutris: rebuild for Python 3.9, drop noarch

---
 srcpkgs/lutris/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 30fbd3ef8d0..cf701853027 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,8 +1,7 @@
 # Template file for 'lutris'
 pkgname=lutris
 version=0.5.7.1
-revision=1
-archs=noarch
+revision=2
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
 depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow

From a988488aa9844f2f0e7cbcff9eec7cb00ea3644b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:50 -0400
Subject: [PATCH 0077/1118] magic-wormhole: rebuild for Python 3.9, drop noarch

---
 srcpkgs/magic-wormhole/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/magic-wormhole/template b/srcpkgs/magic-wormhole/template
index b3a7bdf27f8..755fb7affbc 100644
--- a/srcpkgs/magic-wormhole/template
+++ b/srcpkgs/magic-wormhole/template
@@ -1,8 +1,7 @@
 # Template file for 'magic-wormhole'
 pkgname=magic-wormhole
 version=0.12.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="python3-autobahn python3-cffi python3-click python3-humanize

From fc7ed41b865462ad2a17acab2e9453aea036b697 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:50 -0400
Subject: [PATCH 0078/1118] med: rebuild for Python 3.9, drop noarch

---
 srcpkgs/med/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/med/template b/srcpkgs/med/template
index acd79293246..7cba3c495d1 100644
--- a/srcpkgs/med/template
+++ b/srcpkgs/med/template
@@ -1,7 +1,7 @@
 # Template file for 'med'
 pkgname=med
 version=4.0.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-swig=yes --includedir=/usr/include/med"
 pycompile_module=med
@@ -36,7 +36,6 @@ libmed_package() {
 
 med-doc_package() {
 	short_desc+=" - Documentation"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc/med
 	}

From 1ce2eff07d97d1ddd8da6c2d120351248f55638f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:51 -0400
Subject: [PATCH 0079/1118] menulibre: rebuild for Python 3.9, drop noarch

---
 srcpkgs/menulibre/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/menulibre/template b/srcpkgs/menulibre/template
index f16c5f64337..5327654776d 100644
--- a/srcpkgs/menulibre/template
+++ b/srcpkgs/menulibre/template
@@ -1,8 +1,7 @@
 # Template file for 'menulibre'
 pkgname=menulibre
 version=2.2.1
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="menulibre menulibre_lib"
 hostmakedepends="python3-distutils-extra intltool"

From 171865bba03af87bc8e33c7deed5762b60f5d868 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:51 -0400
Subject: [PATCH 0080/1118] meson: rebuild for Python 3.9, drop noarch

---
 srcpkgs/meson/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2c1bbbc74f6..88e14850bc2 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,8 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.55.3
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

From 0f94ccfff38b0aeafe231631610adeaed0e44eab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:51 -0400
Subject: [PATCH 0081/1118] meson-cmake-wrapper: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/meson-cmake-wrapper/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/meson-cmake-wrapper/template b/srcpkgs/meson-cmake-wrapper/template
index b13ca9229dc..0705bb40c5a 100644
--- a/srcpkgs/meson-cmake-wrapper/template
+++ b/srcpkgs/meson-cmake-wrapper/template
@@ -1,8 +1,7 @@
 # Template file for 'meson-cmake-wrapper'
 pkgname=meson-cmake-wrapper
 version=0.3.4
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="mcw"
 hostmakedepends="python3-setuptools"

From 663805979a65ba22eaaf2c3ac14afb1cf797cc73 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:51 -0400
Subject: [PATCH 0082/1118] mimeo: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mimeo/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mimeo/template b/srcpkgs/mimeo/template
index 66cd1e12539..0f7080919df 100644
--- a/srcpkgs/mimeo/template
+++ b/srcpkgs/mimeo/template
@@ -1,8 +1,7 @@
 # Template file for 'mimeo'
 pkgname=mimeo
 version=2019.7
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="Mimeo.py"
 hostmakedepends="python3"

From 6e4c0e7e5fdd3801bc4c33f416fd7952a56b2da6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:51 -0400
Subject: [PATCH 0083/1118] minigalaxy: rebuild for Python 3.9, drop noarch

---
 srcpkgs/minigalaxy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/minigalaxy/template b/srcpkgs/minigalaxy/template
index 1d2daaea8d0..b18f74c31f6 100644
--- a/srcpkgs/minigalaxy/template
+++ b/srcpkgs/minigalaxy/template
@@ -1,8 +1,7 @@
 # Template file for 'minigalaxy'
 pkgname=minigalaxy
 version=0.9.4
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="hicolor-icon-theme webkit2gtk python3-gobject python3-requests"

From 0a641ecea4ff5dfe475ad852a4c55d569ff51573 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:52 -0400
Subject: [PATCH 0084/1118] mopidy: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mopidy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mopidy/template b/srcpkgs/mopidy/template
index c3497f3b88d..dda7bcfc7d1 100644
--- a/srcpkgs/mopidy/template
+++ b/srcpkgs/mopidy/template
@@ -1,8 +1,7 @@
 # Template file for 'mopidy'
 pkgname=mopidy
 version=3.0.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="Mopidy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx python3-sphinx_rtd_theme python3-pykka"

From 1555f881b5a6fb1467a2719c934f01460b74eefc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:52 -0400
Subject: [PATCH 0085/1118] mopidy-local: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mopidy-local/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mopidy-local/template b/srcpkgs/mopidy-local/template
index 53f42032019..8a7d95c3087 100644
--- a/srcpkgs/mopidy-local/template
+++ b/srcpkgs/mopidy-local/template
@@ -1,8 +1,7 @@
 # Template file for 'mopidy-local'
 pkgname=mopidy-local
 version=3.1.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="mopidy python3-pykka python3-setuptools"

From 09efa4ba2871e5a3ea57836f61368f43c9e880b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:52 -0400
Subject: [PATCH 0086/1118] mopidy-mpd: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mopidy-mpd/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mopidy-mpd/template b/srcpkgs/mopidy-mpd/template
index db1642166fd..dcc3c166cd7 100644
--- a/srcpkgs/mopidy-mpd/template
+++ b/srcpkgs/mopidy-mpd/template
@@ -1,8 +1,7 @@
 # Template file for 'mopidy-mpd'
 pkgname=mopidy-mpd
 version=3.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="Mopidy-MPD-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fbb6c5c8166d866d17ffa78938172e90ee626392 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:52 -0400
Subject: [PATCH 0087/1118] mozo: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mozo/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template
index 22bf450556e..3f6ab9cb745 100644
--- a/srcpkgs/mozo/template
+++ b/srcpkgs/mozo/template
@@ -1,8 +1,7 @@
 # Template file for 'mozo'
 pkgname=mozo
 version=1.24.0
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="glib-devel mate-menus-devel python3-gobject-devel"

From ae7d4dd237cd485f901cffc30876a0ba50c0c342 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:52 -0400
Subject: [PATCH 0088/1118] mpd-sima: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mpd-sima/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mpd-sima/template b/srcpkgs/mpd-sima/template
index 831fec709b7..9ebd2671d05 100644
--- a/srcpkgs/mpd-sima/template
+++ b/srcpkgs/mpd-sima/template
@@ -1,8 +1,7 @@
 # Template file for 'mpd-sima'
 pkgname=mpd-sima
 version=0.15.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="MPD_sima-${version}"
 build_style=python3-module
 pycompile_module="sima"

From b4b458be40fe0944dec885b4d761a8bf51f24e35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:52 -0400
Subject: [PATCH 0089/1118] mps-youtube: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mps-youtube/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mps-youtube/template b/srcpkgs/mps-youtube/template
index 2141b3e627d..dd522974e07 100644
--- a/srcpkgs/mps-youtube/template
+++ b/srcpkgs/mps-youtube/template
@@ -1,8 +1,7 @@
 # Template file for 'mps-youtube'
 pkgname=mps-youtube
 version=0.2.8
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 pycompile_module="mps_youtube"
 hostmakedepends="python3-setuptools"

From 42d09e568598ed1e420da8f984bef22c21bfe838 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:53 -0400
Subject: [PATCH 0090/1118] mugshot: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mugshot/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mugshot/template b/srcpkgs/mugshot/template
index 1e695654a86..31bde94e855 100644
--- a/srcpkgs/mugshot/template
+++ b/srcpkgs/mugshot/template
@@ -1,8 +1,7 @@
 # Template file for 'mugshot'
 pkgname=mugshot
 version=0.4.1
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra"
 depends="accountsservice gtk+3 python3-dbus python3-gobject python3-pexpect"

From ffb88fa72ccf81010d67b7c4a293a7a14aebc7e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:53 -0400
Subject: [PATCH 0091/1118] multibootusb: rebuild for Python 3.9, drop noarch

---
 srcpkgs/multibootusb/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/multibootusb/template b/srcpkgs/multibootusb/template
index c451109bd69..343160b1fcf 100644
--- a/srcpkgs/multibootusb/template
+++ b/srcpkgs/multibootusb/template
@@ -1,8 +1,7 @@
 # Template file for 'multibootusb'
 pkgname=multibootusb
 version=9.2.0
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 pycompile_module="scripts"
 hostmakedepends="python3-setuptools"

From 993b4d2887209300fc8781a8614d0aad4d89e967 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:53 -0400
Subject: [PATCH 0092/1118] mutagen: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mutagen/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/mutagen/template b/srcpkgs/mutagen/template
index 957ed3ed818..552fecc0a50 100644
--- a/srcpkgs/mutagen/template
+++ b/srcpkgs/mutagen/template
@@ -1,8 +1,7 @@
 # Template file for 'mutagen'
 pkgname=mutagen
 version=1.43.0
-revision=2
-archs=noarch
+revision=3
 build_style=python-module
 pycompile_module="mutagen"
 hostmakedepends="python-devel python-setuptools python3-devel
@@ -39,7 +38,6 @@ python3-mutagen_package() {
 	 mutagen:moggsplit:/usr/bin/moggsplit3
 	 mutagen:mutagen-inspect:/usr/bin/mutagen-inspect3
 	 mutagen:mutagen-pony:/usr/bin/mutagen-pony3"
-	archs=noarch
 	depends="python3"
 	pycompile_module="mutagen"
 	short_desc="${short_desc/Python2/Python3}"

From 6517c62a05e06f73f7a85bfe6d568766af9af807 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:53 -0400
Subject: [PATCH 0093/1118] mymcplus: rebuild for Python 3.9, drop noarch

---
 srcpkgs/mymcplus/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/mymcplus/template b/srcpkgs/mymcplus/template
index c46fe9b101e..84b9f256abd 100644
--- a/srcpkgs/mymcplus/template
+++ b/srcpkgs/mymcplus/template
@@ -1,8 +1,7 @@
 # Template file for 'mymcplus'
 pkgname=mymcplus
 version=3.0.3
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="wxPython4 python3-PyOpenGL"

From dd358e782ca59db862bb875d2d731e17851853ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:53 -0400
Subject: [PATCH 0094/1118] nagstamon: update to 3.4.1

---
 .../nagstamon/patches/disable-kerberos.patch  | 39 ++++++++++++-------
 srcpkgs/nagstamon/template                    | 17 ++++----
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/nagstamon/patches/disable-kerberos.patch b/srcpkgs/nagstamon/patches/disable-kerberos.patch
index 3711c18e12a..deacba86517 100644
--- a/srcpkgs/nagstamon/patches/disable-kerberos.patch
+++ b/srcpkgs/nagstamon/patches/disable-kerberos.patch
@@ -1,6 +1,7 @@
---- Nagstamon/QUI/__init__.py.orig	2018-09-12 16:40:47.350735530 +0200
-+++ Nagstamon/QUI/__init__.py	2018-09-12 16:47:18.330913802 +0200
-@@ -5279,7 +5279,7 @@
+diff -ur Nagstamon.orig/Nagstamon/QUI/__init__.py Nagstamon/Nagstamon/QUI/__init__.py
+--- Nagstamon/QUI/__init__.py	2020-01-24 10:12:12.000000000 -0500
++++ Nagstamon/QUI/__init__.py	2020-10-08 00:20:39.437758862 -0400
+@@ -5770,7 +5770,7 @@
          self.ui.button_choose_custom_cert_ca_file.clicked.connect(self.choose_custom_cert_ca_file)
  
          # fill authentication combobox
@@ -9,28 +10,38 @@
  
          # detect change of server type which leads to certain options shown or hidden
          self.ui.input_combobox_type.activated.connect(self.toggle_type)
---- Nagstamon/Servers/Generic.py,orug	2018-09-12 16:40:47.353735516 +0200
-+++ Nagstamon/Servers/Generic.py	2018-09-12 16:47:52.962752440 +0200
-@@ -45,7 +45,6 @@
- from collections import OrderedDict
+diff -ur Nagstamon.orig/Nagstamon/Servers/Generic.py Nagstamon/Nagstamon/Servers/Generic.py
+--- Nagstamon/Servers/Generic.py	2020-01-24 10:12:12.000000000 -0500
++++ Nagstamon/Servers/Generic.py	2020-10-08 00:21:28.460699656 -0400
+@@ -53,15 +53,6 @@
+                               RESOURCES)
  
- import requests
--import requests_kerberos
  
+-# requests_gssapi is newer but not available everywhere
+-try:
+-    # extra imports needed to get it compiled on macOS
+-    import numbers
+-    import gssapi.raw.cython_converters
+-    from requests_gssapi import HTTPSPNEGOAuth as HTTPSKerberos
+-except ImportError:
+-    from requests_kerberos import HTTPKerberosAuth as HTTPSKerberos
+-
  # disable annoying SubjectAltNameWarning warnings
  try:
-@@ -231,8 +230,6 @@
+     from requests.packages.urllib3.exceptions import SubjectAltNameWarning
+@@ -260,8 +251,6 @@
                  self.session.auth = requests.auth.HTTPBasicAuth(self.username, self.password)
              elif self.authentication == 'digest':
                  self.session.auth = requests.auth.HTTPDigestAuth(self.username, self.password)
 -            elif self.authentication == 'kerberos':
--                self.session.auth = requests_kerberos.HTTPKerberosAuth()
+-                self.session.auth = HTTPSKerberos()
  
              # default to check TLS validity
              if self.ignore_cert:
---- setup.py.orig	2018-09-12 16:40:47.363735470 +0200
-+++ setup.py	2018-09-12 16:48:02.146709650 +0200
-@@ -85,7 +85,6 @@
+diff -ur Nagstamon.orig/setup.py Nagstamon/setup.py
+--- setup.py	2020-10-08 00:18:37.532906083 -0400
++++ setup.py	2020-10-08 00:21:43.580681397 -0400
+@@ -89,7 +89,6 @@
          'python3-psutil '
          'python3-qt5 '
          'python3-requests '
diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template
index 0eb5bc75d27..bf07c6d1bce 100644
--- a/srcpkgs/nagstamon/template
+++ b/srcpkgs/nagstamon/template
@@ -1,12 +1,11 @@
 # Template file for 'nagstamon'
 pkgname=nagstamon
-version=3.2.1
-revision=2
-archs=noarch
+version=3.4.1
+revision=1
 wrksrc=Nagstamon
 build_style=python3-module
 pycompile_module="Nagstamon"
-hostmakedepends="python3-setuptools python3-keyring"
+hostmakedepends="python3-setuptools python3-keyring python3-psutil"
 depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
  python3-psutil python3-PyQt5-multimedia python3-PyQt5-svg python3-requests"
 short_desc="Nagios status monitor for the desktop"
@@ -14,12 +13,14 @@ maintainer="Laszlo Dvornik <laulicus@zoho.com>"
 license="GPL-2.0-or-later"
 homepage="https://nagstamon.ifw-dresden.de"
 distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
-checksum=a834460e78dc01f62171a83c4a11d890702264ed662863dff39edaf14ae98880
+checksum=2d26cf4d64a6e27fe55f1c5e5f042af511bcb09876ae16a456aee5800a98adea
 
-post_extract() {
-	# Gone in python 3.8, but these where the python 3.6 values.  ;)
-	vsed -i -e 's/platform.dist()/("","","")/g' setup.py
+post_patch() {
+	# This relies on /etc/os-release, which doesn't exist without
+	# runit-void and doesn't provide the version expected
+	vsed -i setup.py -e 's/get_distro()/"void", "", "void"/'
 }
+
 post_install() {
 	chmod 644 ${DESTDIR}/usr/share/pixmaps/nagstamon.svg
 	mv -v ${DESTDIR}/usr/bin/nagstamon.py ${DESTDIR}/usr/bin/nagstamon

From fd7da23f03224ffc0a88f748fd76e997c438a449 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:54 -0400
Subject: [PATCH 0095/1118] neovim-remote: rebuild for Python 3.9, drop noarch

---
 srcpkgs/neovim-remote/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template
index c826750a004..0353bfd4ab9 100644
--- a/srcpkgs/neovim-remote/template
+++ b/srcpkgs/neovim-remote/template
@@ -1,8 +1,7 @@
 # Template file for 'neovim-remote'
 pkgname=neovim-remote
 version=2.4.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-neovim python3-psutil"

From 164fde1fb48ac7d76041e2dfce203d44eb8b0ba5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:54 -0400
Subject: [PATCH 0096/1118] nicotine+: rebuild for Python 3.9, drop noarch

---
 srcpkgs/nicotine+/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index 6f743890f83..59d92e13ce2 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,8 +1,7 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
 version=2.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
 hostmakedepends="python3"

From d412a6e90272626fc8c40935c6b4ad71d4825b71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:54 -0400
Subject: [PATCH 0097/1118] nyx: rebuild for Python 3.9, drop noarch

---
 srcpkgs/nyx/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/nyx/template b/srcpkgs/nyx/template
index 4b265771793..7edee5a30b7 100644
--- a/srcpkgs/nyx/template
+++ b/srcpkgs/nyx/template
@@ -1,8 +1,7 @@
 # Template file for 'nyx'
 pkgname=nyx
 version=2.1.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="nyx"
 hostmakedepends="python3-setuptools"

From fa01c0ffc3a2baf9f06018ead7872d1720b4cd81 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:54 -0400
Subject: [PATCH 0098/1118] onionshare: rebuild for Python 3.9, drop noarch

---
 srcpkgs/onionshare/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/onionshare/template b/srcpkgs/onionshare/template
index b8df8ae79c7..b9d4fe0fafb 100644
--- a/srcpkgs/onionshare/template
+++ b/srcpkgs/onionshare/template
@@ -1,8 +1,7 @@
 # Template file for 'onionshare'
 pkgname=onionshare
 version=2.2
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 pycompile_dirs="/usr/share/nautilus-python/extensions"
 hostmakedepends="python3-setuptools"

From b2c128834b74d381f1024dd1fac1865a60e4332f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:54 -0400
Subject: [PATCH 0099/1118] pass-import: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pass-import/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index ac7590bea99..51c81c560a6 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,8 +1,7 @@
 # Template file for 'pass-import'
 pkgname=pass-import
 version=3.0
-revision=3
-archs=noarch
+revision=4
 build_style=gnu-makefile
 hostmakedepends="python3-setuptools python3-yaml"
 depends="pass>=1.7.0 python3-defusedxml python3-magic

From 956be18a9e64c5c6d48972ca97c37b369666fecf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:55 -0400
Subject: [PATCH 0100/1118] peframe: rebuild for Python 3.9, drop noarch

---
 srcpkgs/peframe/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/peframe/template b/srcpkgs/peframe/template
index 5ecede6cf56..c8ee506466b 100644
--- a/srcpkgs/peframe/template
+++ b/srcpkgs/peframe/template
@@ -1,8 +1,7 @@
 # Template file for 'peframe'
 pkgname=peframe
 version=6.0.3
-revision=2
-archs=noarch
+revision=3
 build_style="python3-module"
 pycompile_module="peframe"
 hostmakedepends="python3-setuptools"

From 4c23b2c037a4d167bdb638302fe37dfc1eafd60c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:55 -0400
Subject: [PATCH 0101/1118] pelican: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pelican/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index c505227c554..1c47e8d711a 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -1,8 +1,7 @@
 # Template file for 'pelican'
 pkgname=pelican
 version=4.2.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="pelican"
 hostmakedepends="python3-setuptools"

From a010bd09e198134db7b9b577c7a87df5e672a0a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 8 Oct 2020 00:05:12 -0400
Subject: [PATCH 0102/1118] python3-psutil: rebuild for Python 3.9

---
 srcpkgs/python3-psutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template
index 1f89ed410c9..1ff31b4bb2d 100644
--- a/srcpkgs/python3-psutil/template
+++ b/srcpkgs/python3-psutil/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-psutil'
 pkgname=python3-psutil
 version=5.7.0
-revision=3
+revision=4
 wrksrc="psutil-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0817d5023a133cd77c1a08946b959e147ef31261 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:55 -0400
Subject: [PATCH 0103/1118] persepolis: rebuild for Python 3.9, drop noarch

---
 srcpkgs/persepolis/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/persepolis/template b/srcpkgs/persepolis/template
index 696afdd62e6..f1066b3631b 100644
--- a/srcpkgs/persepolis/template
+++ b/srcpkgs/persepolis/template
@@ -1,12 +1,11 @@
 # Template file for 'persepolis'
 pkgname=persepolis
 version=3.2.0
-revision=2
-archs="noarch"
+revision=3
 build_style=python3-module
-hostmakedepends="python3 python3-setuptools python3-setproctitle python3-requests
-	python3-psutil aria2 ffmpeg libnotify pulseaudio youtube-dl sound-theme-freedesktop
-	python3-PyQt5-tools qt5-svg"
+hostmakedepends="python3-setuptools python3-setproctitle python3-requests
+	python3-psutil aria2 ffmpeg libnotify pulseaudio youtube-dl
+	sound-theme-freedesktop python3-PyQt5-tools qt5-svg"
 depends="${hostmakedepends/python3-setuptools/}"
 short_desc="Download manager and GUI for Aria2"
 maintainer="Nathan Owens <ndowens04@gmail.com>"

From bf3c97f71b755f38727ad638adc021f7c479230a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:55 -0400
Subject: [PATCH 0104/1118] peru: rebuild for Python 3.9, drop noarch

---
 srcpkgs/peru/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template
index 6cfdf8170c0..edb0122f192 100644
--- a/srcpkgs/peru/template
+++ b/srcpkgs/peru/template
@@ -1,8 +1,7 @@
 # Template file for 'peru'
 pkgname=peru
 version=1.2.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="peru"
 hostmakedepends="python3-setuptools"

From f8462c2559a0bde3cf2ae38bbb6809e6923289d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:55 -0400
Subject: [PATCH 0105/1118] pex: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pex/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index 105fb3e896d..b6a71768c89 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,8 +1,7 @@
 # Template file for 'pex'
 pkgname=pex
 version=2.1.15
-revision=1
-archs=noarch
+revision=2
 wrksrc="pex-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From 03aae45fe7eab59911f89d4ea303733f46c1ff2a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:55 -0400
Subject: [PATCH 0106/1118] pgcli: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pgcli/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 51835304d71..d8def4ae0c0 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,8 +1,7 @@
 # Template file for 'pgcli'
 pkgname=pgcli
 version=3.0.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit

From f61c957caf3996be4ed818004f68a8c5104b653b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:56 -0400
Subject: [PATCH 0107/1118] picard: rebuild for Python 3.9, drop noarch

---
 srcpkgs/picard/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template
index ca1f29c11de..53f9daa8fdb 100644
--- a/srcpkgs/picard/template
+++ b/srcpkgs/picard/template
@@ -1,8 +1,7 @@
 # Template file for 'picard'
 pkgname=picard
 version=2.3.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 make_install_args="--disable-autoupdate"

From b194e78e955849c4ea8aa6ad8e6a543636d0a7d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:56 -0400
Subject: [PATCH 0108/1118] piper: rebuild for Python 3.9, drop noarch

---
 srcpkgs/piper/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template
index 0f54fe32153..1719f425bb9 100644
--- a/srcpkgs/piper/template
+++ b/srcpkgs/piper/template
@@ -1,8 +1,7 @@
 # Template file for 'piper'
 pkgname=piper
 version=0.5.1
-revision=1
-archs=noarch
+revision=2
 build_style=meson
 hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml"
 makedepends="python3-devel python3-gobject-devel"

From 26650040a0f37732bc05398bb7e707586438ae66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:56 -0400
Subject: [PATCH 0109/1118] playitslowly: rebuild for Python 3.9, drop noarch

---
 srcpkgs/playitslowly/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/playitslowly/template b/srcpkgs/playitslowly/template
index 6d3483ae251..52cbd9870c1 100644
--- a/srcpkgs/playitslowly/template
+++ b/srcpkgs/playitslowly/template
@@ -1,8 +1,7 @@
 # Template file for 'playitslowly'
 pkgname=playitslowly
 version=1.5.1
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3 python3-gobject gtk+3 gstreamer1 gst-plugins-base1 gst-plugins-good1

From aa0a4ea048bc4341e0c4738da750de8823472896 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:56 -0400
Subject: [PATCH 0110/1118] pockyt: update to 1.4.2

---
 srcpkgs/pockyt/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/pockyt/template b/srcpkgs/pockyt/template
index eee3691d959..2b48919d79c 100644
--- a/srcpkgs/pockyt/template
+++ b/srcpkgs/pockyt/template
@@ -1,8 +1,7 @@
 # Template file for 'pockyt'
 pkgname=pockyt
-version=1.2
-revision=2
-archs=noarch
+version=1.4.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-parse"
@@ -12,8 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arvindch/pockyt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cd9561e126a6a01c73762639eb7e38b8c509ed1412f72fcc4729b12565b9962c
-
-post_extract() {
-	sed -i 's/(3, 7)/&, (3, 8)/' setup.py
-}
+checksum=26d16ad6f2dad7db8726f538a9b49ac268731ea3b323c6d48d56873527c35e0b

From a98cbd95fef2175a95a19d64f9371f5e7dd6177e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:56 -0400
Subject: [PATCH 0111/1118] podman-compose: rebuild for Python 3.9, drop noarch

---
 srcpkgs/podman-compose/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 4f4467de689..6a994ae7e8f 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,8 +1,7 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
 version=0.1.5
-revision=1
-archs="noarch"
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-yaml"
 depends="${hostmakedepends} podman"

From 4b3051e0b2aac3251081022770856c105bc05df1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:57 -0400
Subject: [PATCH 0112/1118] protonvpn-cli: rebuild for Python 3.9, drop noarch

---
 srcpkgs/protonvpn-cli/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template
index fb8ed8e0b57..5935d7b4860 100644
--- a/srcpkgs/protonvpn-cli/template
+++ b/srcpkgs/protonvpn-cli/template
@@ -1,8 +1,7 @@
 # Template file for 'protonvpn-cli'
 pkgname=protonvpn-cli
 version=2.2.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="linux-cli-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6b40320db67539df9c24601ab135be13f295f9e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 22:32:09 -0400
Subject: [PATCH 0113/1118] New package: python3-websockets-8.1

---
 srcpkgs/python3-websockets/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-websockets/template

diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
new file mode 100644
index 00000000000..70a4239ab2e
--- /dev/null
+++ b/srcpkgs/python3-websockets/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-websockets'
+pkgname=python3-websockets
+version=8.1
+revision=1
+wrksrc="${pkgname#python3-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Library for building WebSocket clients and servers in Python"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://websockets.readthedocs.io/en/stable/"
+distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz"
+checksum=5c65d2da8c6bce0fca2528f69f44b2f977e06954c8512a952222cea50dad430f
+
+post_install() {
+	vlicense LICENSE
+}

From b5d07c8c6bc41597ae22b5b6c08fdb2bf6e244ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:57 -0400
Subject: [PATCH 0114/1118] pychess: update to 1.0.2

---
 srcpkgs/pychess/template | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/pychess/template b/srcpkgs/pychess/template
index d0594aa77f4..622e5ff451c 100644
--- a/srcpkgs/pychess/template
+++ b/srcpkgs/pychess/template
@@ -1,15 +1,17 @@
 # Template file for 'pychess'
 pkgname=pychess
-version=0.12.4
-revision=3
+version=1.0.2
+revision=1
 build_style=python3-module
 pycompile_module="pychess"
-archs=noarch
-hostmakedepends="python3-setuptools"
-depends="gobject-introspection gst-plugins-base1 gtksourceview python3-gobject"
-short_desc="A GTK chess client written in Python"
+_commondeps="python3-gobject python3-pexpect python3-SQLAlchemy
+ gobject-introspection gtksourceview"
+hostmakedepends="python3-setuptools gettext ${_commondeps}"
+depends="stockfish gnome-icon-theme python3-websockets
+ python3-psutil gst-plugins-base1 ${_commondeps}"
+short_desc="GTK chess client written in Python"
 maintainer="cipr3s <cipr3s@gmx.com>"
-license="GPL-3"
-homepage="http://www.pychess.org"
-distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum="0706861dcea811abb80c8db589494e932b4bab931b2a8799fe53a2bd4b6ac372"
+license="GPL-3.0-or-later"
+homepage="https://pychess.github.io"
+distfiles="https://github.com/pychess/${pkgname}/archive/${version}.tar.gz"
+checksum=06d9274775fb0aac480fcc40f0007be3c5309da6a122013472d36de7de8d5fa2

From 2257a731f1391f0cf66f283c9987077b513788d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:57 -0400
Subject: [PATCH 0115/1118] pycp: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pycp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pycp/template b/srcpkgs/pycp/template
index c9066259862..003f2e9724f 100644
--- a/srcpkgs/pycp/template
+++ b/srcpkgs/pycp/template
@@ -1,8 +1,7 @@
 # Template file for 'pycp'
 pkgname=pycp
 version=8.0.8
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="pycp"
 hostmakedepends="help2man python3-setuptools"

From a35e12f33194217c8d8b39eb3a88c153e81be088 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:57 -0400
Subject: [PATCH 0116/1118] pyradio: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pyradio/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 808c298c7b5..20480efa490 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,8 +1,7 @@
 # Template file for 'pyradio'
 pkgname=pyradio
 version=0.8.7.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"

From a278539cbb996ba17fad47365082ae823b0e116f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:57 -0400
Subject: [PATCH 0117/1118] pysolfc: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pysolfc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template
index b634a8da817..7440cee9b0f 100644
--- a/srcpkgs/pysolfc/template
+++ b/srcpkgs/pysolfc/template
@@ -1,8 +1,7 @@
 # Template file for 'pysolfc'
 pkgname=pysolfc
 version=2.10.1
-revision=1
-archs="noarch"
+revision=2
 wrksrc="PySolFC-${pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-pygame python3-random2 python3-six

From d60f5d35c1297b3055f11a8d6034dc68ec646dfd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:58 -0400
Subject: [PATCH 0118/1118] python3-3to2: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-3to2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-3to2/template b/srcpkgs/python3-3to2/template
index 38558f1fcff..ddbef419178 100644
--- a/srcpkgs/python3-3to2/template
+++ b/srcpkgs/python3-3to2/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-3to2'
 pkgname=python3-3to2
 version=1.1.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="3to2-${version}"
 build_style=python3-module
 pycompile_module="lib3to2"

From 683a59352742d441649d8a4278715b0798356fae Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:58 -0400
Subject: [PATCH 0119/1118] python3-CherryPy: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-CherryPy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-CherryPy/template b/srcpkgs/python3-CherryPy/template
index 2b5fa77a786..c21123b9baf 100644
--- a/srcpkgs/python3-CherryPy/template
+++ b/srcpkgs/python3-CherryPy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-CherryPy'
 pkgname=python3-CherryPy
 version=18.6.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="CherryPy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 11e4b9bfee56db436e14da684edf77583a8f8f1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:58 -0400
Subject: [PATCH 0120/1118] python3-Django: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-Django/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Django/template b/srcpkgs/python3-Django/template
index 9f1a08f968d..23a383b915d 100644
--- a/srcpkgs/python3-Django/template
+++ b/srcpkgs/python3-Django/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Django'
 pkgname=python3-Django
 version=3.0.7
-revision=1
-archs=noarch
+revision=2
 wrksrc="Django-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2a527338cb13c8c531e29d1652543ec1e0eb984a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:58 -0400
Subject: [PATCH 0121/1118] python3-EasyProcess: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-EasyProcess/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-EasyProcess/template b/srcpkgs/python3-EasyProcess/template
index 725467884d4..034df5dc09c 100644
--- a/srcpkgs/python3-EasyProcess/template
+++ b/srcpkgs/python3-EasyProcess/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-EasyProcess'
 pkgname=python3-EasyProcess
 version=0.3
-revision=1
-archs=noarch
+revision=2
 wrksrc=EasyProcess-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 61db8699ba9f3948d71cf1627c58938a74b18ad6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:58 -0400
Subject: [PATCH 0122/1118] python3-Flask-Mail: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-Flask-Mail/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Flask-Mail/template b/srcpkgs/python3-Flask-Mail/template
index f1e31e984d0..18542847ecb 100644
--- a/srcpkgs/python3-Flask-Mail/template
+++ b/srcpkgs/python3-Flask-Mail/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Flask-Mail'
 pkgname=python3-Flask-Mail
 version=0.9.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0098beeb2c04078d1a86d9731698cfa5a2978990 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:59 -0400
Subject: [PATCH 0123/1118] python3-Flask-RESTful: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-Flask-RESTful/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Flask-RESTful/template b/srcpkgs/python3-Flask-RESTful/template
index 74f5be02359..723733ddf33 100644
--- a/srcpkgs/python3-Flask-RESTful/template
+++ b/srcpkgs/python3-Flask-RESTful/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Flask-RESTful'
 pkgname=python3-Flask-RESTful
 version=0.3.8
-revision=1
-archs=noarch
+revision=2
 wrksrc="flask-restful-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bbe8bfb789a190258712d8e0f10a34ddc072930e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:59 -0400
Subject: [PATCH 0124/1118] python3-Flask-SQLAlchemy: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-Flask-SQLAlchemy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Flask-SQLAlchemy/template b/srcpkgs/python3-Flask-SQLAlchemy/template
index 392425b0610..4d269e2c4dd 100644
--- a/srcpkgs/python3-Flask-SQLAlchemy/template
+++ b/srcpkgs/python3-Flask-SQLAlchemy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Flask-SQLAlchemy'
 pkgname=python3-Flask-SQLAlchemy
 version=2.4.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e600d7db65dd73f298e4a76d0d6c5bdfc84a2c39 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:59 -0400
Subject: [PATCH 0125/1118] python3-Flask-User: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-Flask-User/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Flask-User/template b/srcpkgs/python3-Flask-User/template
index 1de87f20bf4..ad2fa8483c7 100644
--- a/srcpkgs/python3-Flask-User/template
+++ b/srcpkgs/python3-Flask-User/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Flask-User'
 pkgname=python3-Flask-User
 version=1.0.2.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3251259742e476df838b211c2662c42ea0e0ddbf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:59 -0400
Subject: [PATCH 0126/1118] python3-Inflector: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-Inflector/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Inflector/template b/srcpkgs/python3-Inflector/template
index e890c1ad256..ec4da0d4c03 100644
--- a/srcpkgs/python3-Inflector/template
+++ b/srcpkgs/python3-Inflector/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Inflector'
 pkgname=python3-Inflector
 version=3.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="Inflector-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a12505dc63e14a0d330dd3864a11273ff9cb8ff1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:49:59 -0400
Subject: [PATCH 0127/1118] python3-Markdown: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-Markdown/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template
index 3c2e12cbe8d..ef11fca0c8e 100644
--- a/srcpkgs/python3-Markdown/template
+++ b/srcpkgs/python3-Markdown/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Markdown'
 pkgname=python3-Markdown
 version=3.2.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="Markdown-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c9bea89c3c5c58dc38390092837439c7bdc34288 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:00 -0400
Subject: [PATCH 0128/1118] python3-MechanicalSoup: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-MechanicalSoup/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-MechanicalSoup/template b/srcpkgs/python3-MechanicalSoup/template
index 5a3b0b3eb03..f763efcf4e7 100644
--- a/srcpkgs/python3-MechanicalSoup/template
+++ b/srcpkgs/python3-MechanicalSoup/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-MechanicalSoup'
 pkgname=python3-MechanicalSoup
 version=0.12.0
-revision=2
-archs=noarch
+revision=3
 wrksrc=MechanicalSoup-${version}
 build_style=python3-module
 pycompile_module="mechanicalsoup"

From 84508c8aaecc17363e034fedf99cc11e8422c95c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:00 -0400
Subject: [PATCH 0129/1118] python3-Pebble: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-Pebble/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pebble/template b/srcpkgs/python3-Pebble/template
index 0d91d52c6d1..7ce41a31eae 100644
--- a/srcpkgs/python3-Pebble/template
+++ b/srcpkgs/python3-Pebble/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Pebble'
 pkgname=python3-Pebble
 version=4.5.3
-revision=1
-archs=noarch
+revision=2
 wrksrc=Pebble-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From af006fe51acc753820c204105bfe33c4c74119b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:00 -0400
Subject: [PATCH 0130/1118] python3-PyBrowserID: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-PyBrowserID/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-PyBrowserID/template b/srcpkgs/python3-PyBrowserID/template
index eefd0175f1b..a8cdd9230d3 100644
--- a/srcpkgs/python3-PyBrowserID/template
+++ b/srcpkgs/python3-PyBrowserID/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-PyBrowserID'
 pkgname=python3-PyBrowserID
 version=0.14.0
-revision=3
-archs=noarch
+revision=4
 wrksrc="PyBrowserID-${version}"
 build_style=python3-module
 pycompile_module="browserid"

From a1b422c0af0f2118d1c8e417fba55f25fd3c34ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:00 -0400
Subject: [PATCH 0131/1118] python3-PyFxA: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-PyFxA/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-PyFxA/template b/srcpkgs/python3-PyFxA/template
index 6fc6791efdd..c7fdfff1c93 100644
--- a/srcpkgs/python3-PyFxA/template
+++ b/srcpkgs/python3-PyFxA/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-PyFxA'
 pkgname=python3-PyFxA
 version=0.7.3
-revision=2
-archs=noarch
+revision=3
 wrksrc="PyFxA-${version}"
 build_style=python3-module
 pycompile_module="fxa"

From 06969ded51ad88838f59fe525aaae8844db0dcc3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:00 -0400
Subject: [PATCH 0132/1118] python3-PyVirtualDisplay: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-PyVirtualDisplay/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-PyVirtualDisplay/template b/srcpkgs/python3-PyVirtualDisplay/template
index e7c42f99c4e..5321d2c98fb 100644
--- a/srcpkgs/python3-PyVirtualDisplay/template
+++ b/srcpkgs/python3-PyVirtualDisplay/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-PyVirtualDisplay'
 pkgname=python3-PyVirtualDisplay
 version=1.3.2
-revision=1
-archs=noarch
+revision=2
 wrksrc=PyVirtualDisplay-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e5c01471311dabea269446e26f5cc6f602a5f1ec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:00 -0400
Subject: [PATCH 0133/1118] python3-QtPy: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-QtPy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-QtPy/template b/srcpkgs/python3-QtPy/template
index 2ddc8b313ee..8205641c6b5 100644
--- a/srcpkgs/python3-QtPy/template
+++ b/srcpkgs/python3-QtPy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-QtPy'
 pkgname=python3-QtPy
 version=1.9.0
-revision=1
-archs=noarch
+revision=2
 wrksrc=QtPy-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2b9f35c6aec8098d5d81ce41064d3ad47f3a256f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:01 -0400
Subject: [PATCH 0134/1118] python3-ReParser: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-ReParser/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ReParser/template b/srcpkgs/python3-ReParser/template
index 5959de9d0e3..f37eeb897ed 100644
--- a/srcpkgs/python3-ReParser/template
+++ b/srcpkgs/python3-ReParser/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-ReParser'
 pkgname=python3-ReParser
 version=1.4.3
-revision=2
-archs=noarch
+revision=3
 wrksrc=ReParser-${version}
 build_style=python3-module
 pycompile_module="reparser.py"

From 8c5f69cfa8c80b662b2e98ad68a202b64eddd4e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:01 -0400
Subject: [PATCH 0135/1118] python3-Ropper: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-Ropper/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Ropper/template b/srcpkgs/python3-Ropper/template
index 6cf233bd99a..88f5b4523e0 100644
--- a/srcpkgs/python3-Ropper/template
+++ b/srcpkgs/python3-Ropper/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Ropper'
 pkgname=python3-Ropper
 version=1.13.5
-revision=1
-archs="noarch"
+revision=2
 wrksrc="Ropper-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d21f3324c27211f9cd5d99c62976a5d5ba76f974 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:01 -0400
Subject: [PATCH 0136/1118] python3-SecretStorage: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-SecretStorage/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-SecretStorage/template b/srcpkgs/python3-SecretStorage/template
index 864d1385411..ce682ca8ce4 100644
--- a/srcpkgs/python3-SecretStorage/template
+++ b/srcpkgs/python3-SecretStorage/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-SecretStorage'
 pkgname=python3-SecretStorage
 version=3.1.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="SecretStorage-${version}"
 build_style=python3-module
 pycompile_module="secretstorage"

From 9f04b113797c0d8bcda969e27659ee7f25501c9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:01 -0400
Subject: [PATCH 0137/1118] python3-SoCo: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-SoCo/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-SoCo/template b/srcpkgs/python3-SoCo/template
index 9a27dcdb264..809ffcd3a21 100644
--- a/srcpkgs/python3-SoCo/template
+++ b/srcpkgs/python3-SoCo/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-SoCo'
 pkgname=python3-SoCo
 version=0.18.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="SoCo-${version}"
 build_style=python3-module
 pycompile_module="soco"

From 65fdfa4bcecf7f1435e03398aa0d47ec6de26451 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:01 -0400
Subject: [PATCH 0138/1118] python3-Telethon: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-Telethon/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template
index 25ccd5200e5..a6c8f89131c 100644
--- a/srcpkgs/python3-Telethon/template
+++ b/srcpkgs/python3-Telethon/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-Telethon'
 pkgname=python3-Telethon
 version=1.13.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="Telethon-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cefdc7fce935676fba9dc0b7c4657c8b19142e44 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:02 -0400
Subject: [PATCH 0139/1118] python3-TxSNI: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-TxSNI/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-TxSNI/template b/srcpkgs/python3-TxSNI/template
index 22b38d1d3cf..72020678230 100644
--- a/srcpkgs/python3-TxSNI/template
+++ b/srcpkgs/python3-TxSNI/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-TxSNI'
 pkgname=python3-TxSNI
 version=0.1.9
-revision=3
-archs=noarch
+revision=4
 create_wrksrc=yes
 build_wrksrc="TxSNI-${version}"
 build_style=python3-module

From 89bdc918ad939e54e433e5d8a1c6054b023235e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:02 -0400
Subject: [PATCH 0140/1118] python3-WebOb: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-WebOb/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-WebOb/template b/srcpkgs/python3-WebOb/template
index 53e63879f2c..e3de30ca017 100644
--- a/srcpkgs/python3-WebOb/template
+++ b/srcpkgs/python3-WebOb/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-WebOb'
 pkgname=python3-WebOb
 version=1.8.5
-revision=2
-archs=noarch
+revision=3
 wrksrc="WebOb-${version}"
 build_style=python3-module
 pycompile_module="webob"

From 81ea37cfebcc44a50e79c4d8bdf5aaa5773b0bff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:02 -0400
Subject: [PATCH 0141/1118] python3-XlsxWriter: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-XlsxWriter/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-XlsxWriter/template b/srcpkgs/python3-XlsxWriter/template
index b991457e01e..f7374c7a9a3 100644
--- a/srcpkgs/python3-XlsxWriter/template
+++ b/srcpkgs/python3-XlsxWriter/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-XlsxWriter'
 pkgname=python3-XlsxWriter
 version=1.1.8
-revision=2
-archs="noarch"
+revision=3
 wrksrc="XlsxWriter-RELEASE_${version}"
 build_style=python3-module
 pycompile_module="XlsxWriter"

From c3f1a4970d3d7284824753695f24569c48752b0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:02 -0400
Subject: [PATCH 0142/1118] python3-aioamqp: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aioamqp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template
index 861cec8f543..13bb48d1a03 100644
--- a/srcpkgs/python3-aioamqp/template
+++ b/srcpkgs/python3-aioamqp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aioamqp'
 pkgname=python3-aioamqp
 version=0.14.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="aioamqp-aioamqp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0e3a2a6e7a93ecdd8c438830fd5c2f5da7028dc5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:02 -0400
Subject: [PATCH 0143/1118] python3-aiodns: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-aiodns/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aiodns/template b/srcpkgs/python3-aiodns/template
index bca5802ef69..fc5aa977fc6 100644
--- a/srcpkgs/python3-aiodns/template
+++ b/srcpkgs/python3-aiodns/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aiodns'
 pkgname=python3-aiodns
 version=2.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="aiodns-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cc9083eb292a87830daadb85b58d3144b23b4a4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:02 -0400
Subject: [PATCH 0144/1118] python3-aiofiles: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aiofiles/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aiofiles/template b/srcpkgs/python3-aiofiles/template
index 61d4d081821..dcfc7a7a242 100644
--- a/srcpkgs/python3-aiofiles/template
+++ b/srcpkgs/python3-aiofiles/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aiofiles'
 pkgname=python3-aiofiles
 version=0.5.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d8f4229139934430093c4078542b72d893fd0ee4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:03 -0400
Subject: [PATCH 0145/1118] python3-aiohttp-cors: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aiohttp-cors/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aiohttp-cors/template b/srcpkgs/python3-aiohttp-cors/template
index b621716e3cd..14eb43d1e33 100644
--- a/srcpkgs/python3-aiohttp-cors/template
+++ b/srcpkgs/python3-aiohttp-cors/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aiohttp-cors'
 pkgname=python3-aiohttp-cors
 version=0.7.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="aiohttp-cors-${version}"
 build_style=python3-module
 pycompile_module="aiohttp_cors"

From 8b294cb89883fe0a0db0646bb6ff8864cec3b5fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:03 -0400
Subject: [PATCH 0146/1118] python3-aiohttp-cors2: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aiohttp-cors2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aiohttp-cors2/template b/srcpkgs/python3-aiohttp-cors2/template
index f13b0598456..2bb6e5523e0 100644
--- a/srcpkgs/python3-aiohttp-cors2/template
+++ b/srcpkgs/python3-aiohttp-cors2/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aiohttp-cors2'
 pkgname=python3-aiohttp-cors2
 version=0.7.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="aiohttp-cors-${version}"
 build_style=python3-module
 pycompile_module="aiohttp_cors"

From 8a96ba44a19e3f5d2f570357ede4883cf6d7aa14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:03 -0400
Subject: [PATCH 0147/1118] python3-aiohttp-sse-client: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-aiohttp-sse-client/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aiohttp-sse-client/template b/srcpkgs/python3-aiohttp-sse-client/template
index 6599b036e97..07210dbfc73 100644
--- a/srcpkgs/python3-aiohttp-sse-client/template
+++ b/srcpkgs/python3-aiohttp-sse-client/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aiohttp-sse-client'
 pkgname=python3-aiohttp-sse-client
 version=0.1.7
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b6a4e632922e05831889ffeb5de9d0813404bdf0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:03 -0400
Subject: [PATCH 0148/1118] python3-aiohttp_socks: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aiohttp_socks/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index 10ab967ef76..fa75a54302c 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aiohttp_socks'
 pkgname=python3-aiohttp_socks
 version=0.2.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="aiohttp_socks-${version}"
 build_style=python3-module
 pycompile_module="aiohttp_socks"

From edc7d53c43b7040b7c6021bce36868a5cbad86b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:03 -0400
Subject: [PATCH 0149/1118] python3-aioinflux: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aioinflux/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aioinflux/template b/srcpkgs/python3-aioinflux/template
index d63da0c2ccc..612ab7076b3 100644
--- a/srcpkgs/python3-aioinflux/template
+++ b/srcpkgs/python3-aioinflux/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aioinflux'
 pkgname=python3-aioinflux
 version=0.9.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1a70a87932de75c1e9adc119297a844967efe994 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:04 -0400
Subject: [PATCH 0150/1118] python3-aionotify: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aionotify/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aionotify/template b/srcpkgs/python3-aionotify/template
index 93d857f71b6..b2c18dc979b 100644
--- a/srcpkgs/python3-aionotify/template
+++ b/srcpkgs/python3-aionotify/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aionotify'
 pkgname=python3-aionotify
 version=0.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="aionotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a837fd90dfa44f239e693d51fa7830f989983974 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:04 -0400
Subject: [PATCH 0151/1118] python3-aioredis: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aioredis/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aioredis/template b/srcpkgs/python3-aioredis/template
index c93ad443386..90337771ace 100644
--- a/srcpkgs/python3-aioredis/template
+++ b/srcpkgs/python3-aioredis/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aioredis'
 pkgname=python3-aioredis
 version=1.3.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5c4ede1e63be6908b9db51d4659cc18dddaaae0c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:04 -0400
Subject: [PATCH 0152/1118] python3-aiorpcx: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aiorpcx/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template
index 3e25da6752f..4d44cf495c2 100644
--- a/srcpkgs/python3-aiorpcx/template
+++ b/srcpkgs/python3-aiorpcx/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aiorpcx'
 pkgname=python3-aiorpcx
 version=0.18.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="aiorpcX-${version}"
 build_style=python3-module
 pycompile_module="aiorpcx"

From ec97524b051f8dc35c4544d6b5a3066a52fa0984 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:04 -0400
Subject: [PATCH 0153/1118] python3-altgraph: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-altgraph/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-altgraph/template b/srcpkgs/python3-altgraph/template
index 2bf433edb6e..a1ad53d67a1 100644
--- a/srcpkgs/python3-altgraph/template
+++ b/srcpkgs/python3-altgraph/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-altgraph'
 pkgname=python3-altgraph
 version=0.16.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="altgraph-${version}"
 build_style=python3-module
 pycompile_module="altgraph"

From 0835592663a8e79190ca47baaeb0ed5920cd2ffc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:04 -0400
Subject: [PATCH 0154/1118] python3-aniso8601: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-aniso8601/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-aniso8601/template b/srcpkgs/python3-aniso8601/template
index 0253b89b5a3..570696f9ff3 100644
--- a/srcpkgs/python3-aniso8601/template
+++ b/srcpkgs/python3-aniso8601/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-aniso8601'
 pkgname=python3-aniso8601
 version=8.0.0
-revision=2
-archs=noarch
+revision=3
 _gitver=0ec13b9d81c9
 wrksrc="nielsenb-aniso8601-${_gitver}"
 build_style=python3-module

From f1e77aabcaed6c07b1a0e917cca7c4b7c3d482e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:04 -0400
Subject: [PATCH 0155/1118] python3-ansible-lint: update to 4.3.5

---
 srcpkgs/python3-ansible-lint/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index cb3832799a1..dfb1a82418d 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,21 +1,23 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=4.1.0
-revision=2
-archs=noarch
+version=4.3.5
+revision=1
 wrksrc="ansible-lint-${version}"
 build_style=python3-module
-pycompile_module="ansiblelint"
 hostmakedepends="python3-setuptools"
-depends="ansible python3-setuptools python3-six python3-yaml
- python3-ruamel.yaml"
+depends="ansible python3-six python3-yaml python3-ruamel.yaml"
 short_desc="Linter for Ansible files"
 maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
 license="MIT"
 homepage="https://github.com/willthames/ansible-lint"
 changelog="https://raw.githubusercontent.com/willthames/ansible-lint/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=83cffafaa59d724af2ba9e1b143d8a69035b4e58ceaf5ed0fdc3b845aff881a0
+checksum=df5ffb79cbd76ab02bf6dd4b493502d6ba59fafb669d6f57f487251a6c955adc
+
+post_patch() {
+	vsed -i pyproject.toml -e '/setuptools_scm/d'
+	vsed -i setup.cfg -e '/setup_requires =/,/setuptools_scm_git_archive/d'
+}
 
 post_install() {
 	vlicense LICENSE

From d1225c97dcd0dfebafb1a50d6c195075759a7462 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:05 -0400
Subject: [PATCH 0156/1118] python3-anytree: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-anytree/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-anytree/template b/srcpkgs/python3-anytree/template
index 5bd9b407017..e767018e633 100644
--- a/srcpkgs/python3-anytree/template
+++ b/srcpkgs/python3-anytree/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-anytree'
 pkgname=python3-anytree
 version=2.8.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="anytree-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 732068c15a3872ff23114d4d1ff97540bc0f0a7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:05 -0400
Subject: [PATCH 0157/1118] python3-applib: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-applib/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-applib/template b/srcpkgs/python3-applib/template
index 3a5a4ed5d40..50ba75041fc 100644
--- a/srcpkgs/python3-applib/template
+++ b/srcpkgs/python3-applib/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-applib'
 pkgname=python3-applib
 version=1.2
-revision=3
-archs=noarch
+revision=4
 create_wrksrc=yes
 build_wrksrc="applib-${version}"
 build_style=python3-module

From 39930b2e09a67797c0835cd8bee5323cdaea7be1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:05 -0400
Subject: [PATCH 0158/1118] python3-astral: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-astral/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astral/template b/srcpkgs/python3-astral/template
index d290eee7806..e9fcd0dfbe6 100644
--- a/srcpkgs/python3-astral/template
+++ b/srcpkgs/python3-astral/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-astral'
 pkgname=python3-astral
 version=2.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From e0439d2ac9df6e815a746fb49feaa378e920cdfc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:05 -0400
Subject: [PATCH 0159/1118] python3-astroid: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-astroid/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index ff4a857e214..3d98165a52d 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
 version=2.4.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a65d626bafc31c591714bde4cf749b9d3add9b71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:05 -0400
Subject: [PATCH 0160/1118] python3-async-timeout: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-async-timeout/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template
index 854584fb5b2..bcc7fc17048 100644
--- a/srcpkgs/python3-async-timeout/template
+++ b/srcpkgs/python3-async-timeout/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-async-timeout'
 pkgname=python3-async-timeout
 version=3.0.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="async-timeout-${version}"
 build_style=python3-module
 pycompile_module="async_timeout"

From 80bad14d8faa33f8f8de8c4f378f5e6f5d1e08cc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:06 -0400
Subject: [PATCH 0161/1118] python3-async_generator: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-async_generator/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-async_generator/template b/srcpkgs/python3-async_generator/template
index 20d9f7ea0d1..0c2b4d0722a 100644
--- a/srcpkgs/python3-async_generator/template
+++ b/srcpkgs/python3-async_generator/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-async_generator'
 pkgname=python3-async_generator
 version=1.10
-revision=2
-archs=noarch
+revision=3
 wrksrc="async_generator-${version}"
 build_style=python3-module
 pycompile_module="async_generator"

From 0676d816f1fbba69459cce46a9a9a875d56fc40e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:06 -0400
Subject: [PATCH 0162/1118] python3-authres: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-authres/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-authres/template b/srcpkgs/python3-authres/template
index 27f543c33ba..254830e55fe 100644
--- a/srcpkgs/python3-authres/template
+++ b/srcpkgs/python3-authres/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-authres'
 pkgname=python3-authres
 version=1.2.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="authres-${version}"
 build_style=python3-module
 pycompile_module=authres

From bf0e607512461c87a7e01997e69f8feca71465a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:06 -0400
Subject: [PATCH 0163/1118] python3-autobahn: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-autobahn/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template
index fb3c80d8bb7..516e936a7a3 100644
--- a/srcpkgs/python3-autobahn/template
+++ b/srcpkgs/python3-autobahn/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-autobahn'
 pkgname=python3-autobahn
 version=20.7.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="autobahn-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From 262b33a90c207bff00befa64d602370ff18c88e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:06 -0400
Subject: [PATCH 0164/1118] python3-blessed: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-blessed/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index ab1b0a7273c..54ab5fa0131 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-blessed'
 pkgname=python3-blessed
 version=1.17.10
-revision=1
-archs=noarch
+revision=2
 wrksrc="blessed-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0b35222365a3fcabdb3fa5fface3851b05b0840a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:06 -0400
Subject: [PATCH 0165/1118] python3-boltons: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-boltons/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-boltons/template b/srcpkgs/python3-boltons/template
index 78f0f03a762..1ff0d6efe85 100644
--- a/srcpkgs/python3-boltons/template
+++ b/srcpkgs/python3-boltons/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-boltons'
 pkgname=python3-boltons
 version=19.3.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="boltons-${version}"
 build_style=python3-module
 pycompile_module="boltons"

From 5dab8f2454f2f53d54ea2a017b2fcc382ddfd45f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:07 -0400
Subject: [PATCH 0166/1118] python3-canonicaljson: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-canonicaljson/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 87b7c8cc8e3..22ae94ab2b5 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
 version=1.3.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 02a7c075f1113bb25954125b6570d1824c7b762d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:07 -0400
Subject: [PATCH 0167/1118] python3-casttube: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-casttube/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-casttube/template b/srcpkgs/python3-casttube/template
index 9e5544b0101..ca94d184a23 100644
--- a/srcpkgs/python3-casttube/template
+++ b/srcpkgs/python3-casttube/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-casttube'
 pkgname=python3-casttube
 version=0.2.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="casttube-${version}"
 build_style=python3-module
 pycompile_module="casttube"

From a398c98199f6ddeb914dfedf813e71b1df4d6ef4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:07 -0400
Subject: [PATCH 0168/1118] python3-certifi: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-certifi/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-certifi/template b/srcpkgs/python3-certifi/template
index 35807ad3642..0d1a4667a2f 100644
--- a/srcpkgs/python3-certifi/template
+++ b/srcpkgs/python3-certifi/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-certifi'
 pkgname=python3-certifi
 version=2020.06.20
-revision=1
-archs=noarch
+revision=2
 wrksrc="python-certifi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ccb93d30e831918099c37d9eace04bb32df28ea9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:07 -0400
Subject: [PATCH 0169/1118] python3-changelogs: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-changelogs/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template
index d9a7784cf3b..b86a11862af 100644
--- a/srcpkgs/python3-changelogs/template
+++ b/srcpkgs/python3-changelogs/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-changelogs'
 pkgname=python3-changelogs
 version=0.14.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="changelogs-${version}"
 build_style=python3-module
 pycompile_module="changelogs"

From 9c2d472510832ec624dbe39c8d1f3975f58d02c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:07 -0400
Subject: [PATCH 0170/1118] python3-chess: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-chess/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-chess/template b/srcpkgs/python3-chess/template
index 3bf7847302e..f84b994f37b 100644
--- a/srcpkgs/python3-chess/template
+++ b/srcpkgs/python3-chess/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-chess'
 pkgname=python3-chess
 version=0.30.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="python-chess-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 39ab166c5b1227e8487408e4fb6d745168c33311 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:07 -0400
Subject: [PATCH 0171/1118] python3-chromecast: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-chromecast/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index e83286d30ce..e07078d8051 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
 version=4.1.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="pychromecast-${version}"
 build_style=python3-module
 pycompile_module="pychromecast"

From aaf8a05dcce015be1fded6fd09f509f02a158125 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:08 -0400
Subject: [PATCH 0172/1118] python3-cjkwrap: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-cjkwrap/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cjkwrap/template b/srcpkgs/python3-cjkwrap/template
index fa951f26223..79a14c56462 100644
--- a/srcpkgs/python3-cjkwrap/template
+++ b/srcpkgs/python3-cjkwrap/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-cjkwrap'
 pkgname=python3-cjkwrap
 version=2.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="cjkwrap-v${version}"
 build_style=python3-module
 pycompile_module="cjkwrap.py"

From d90e4adb902e41aff31add0304ea5a0c7b8aadbd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:08 -0400
Subject: [PATCH 0173/1118] python3-cli-ui: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-cli-ui/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cli-ui/template b/srcpkgs/python3-cli-ui/template
index b8e8c97d96f..ef558336647 100644
--- a/srcpkgs/python3-cli-ui/template
+++ b/srcpkgs/python3-cli-ui/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-cli-ui'
 pkgname=python3-cli-ui
 version=0.10.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="python-cli-ui-${version}"
 build_style=python3-module
 pycompile_module="cli_ui"

From 505bea9cd2396655675561d0a97d684b59f15c57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:08 -0400
Subject: [PATCH 0174/1118] python3-cli_helpers: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-cli_helpers/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template
index 87b284e3cb5..91e22d2471c 100644
--- a/srcpkgs/python3-cli_helpers/template
+++ b/srcpkgs/python3-cli_helpers/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-cli_helpers'
 pkgname=python3-cli_helpers
 version=1.2.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="cli_helpers-${version}"
 build_style=python3-module
 pycompile_module="cli_helpers"

From 1bb81b410bfe35d9725f233adb8f7cfa0393ae57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:08 -0400
Subject: [PATCH 0175/1118] python3-click-plugins: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-click-plugins/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-click-plugins/template b/srcpkgs/python3-click-plugins/template
index 0ef6ce6b248..e62d64c0e5a 100644
--- a/srcpkgs/python3-click-plugins/template
+++ b/srcpkgs/python3-click-plugins/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-click-plugins'
 pkgname=python3-click-plugins
 version=1.1.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="click-plugins-${version}"
 build_style=python3-module
 pycompile_module="click-plugins"

From 4c4d92113c38c4ef119e0177ff67edf4b76dde3a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:08 -0400
Subject: [PATCH 0176/1118] python3-click-repl: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-click-repl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-click-repl/template b/srcpkgs/python3-click-repl/template
index 8d258f30e57..bcae416544c 100644
--- a/srcpkgs/python3-click-repl/template
+++ b/srcpkgs/python3-click-repl/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-click-repl'
 pkgname=python3-click-repl
 version=0.1.6
-revision=1
-archs=noarch
+revision=2
 wrksrc="click-repl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fc34756b0c5b608561367b91427ff5075b4a73cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:09 -0400
Subject: [PATCH 0177/1118] python3-cloudscraper: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-cloudscraper/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cloudscraper/template b/srcpkgs/python3-cloudscraper/template
index 9393d49dff1..533bab2e44c 100644
--- a/srcpkgs/python3-cloudscraper/template
+++ b/srcpkgs/python3-cloudscraper/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-cloudscraper'
 pkgname=python3-cloudscraper
 version=1.2.46
-revision=1
-archs=noarch
+revision=2
 wrksrc=cloudscraper-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e93e24d20400b7326425dabef1b471200468055d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:09 -0400
Subject: [PATCH 0178/1118] python3-cmdln: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-cmdln/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cmdln/template b/srcpkgs/python3-cmdln/template
index 2b7e21f3980..2f19f24ac97 100644
--- a/srcpkgs/python3-cmdln/template
+++ b/srcpkgs/python3-cmdln/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-cmdln'
 pkgname=python3-cmdln
 version=2.0.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="cmdln-${version}"
 build_style=python3-module
 pycompile_module="cmdln.py"

From eee17f97c8d54b4058ead0a76161be68d2693093 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:09 -0400
Subject: [PATCH 0179/1118] python3-colorclass: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-colorclass/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-colorclass/template b/srcpkgs/python3-colorclass/template
index ed8d2d2ea02..646f69b1316 100644
--- a/srcpkgs/python3-colorclass/template
+++ b/srcpkgs/python3-colorclass/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-colorclass'
 pkgname=python3-colorclass
 version=2.2.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="colorclass-${version}"
 build_style=python3-module
 pycompile_module="colorclass"

From 7d90e8689447a27e8202c037470f93ef440b188f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:09 -0400
Subject: [PATCH 0180/1118] python3-dateparser: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-dateparser/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-dateparser/template b/srcpkgs/python3-dateparser/template
index e36395eea8a..abe4d6b7ea3 100644
--- a/srcpkgs/python3-dateparser/template
+++ b/srcpkgs/python3-dateparser/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-dateparser'
 pkgname=python3-dateparser
 version=0.7.6
-revision=1
-archs=noarch
+revision=2
 wrksrc=dateparser-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7499fb7fc171f39cbdde1ea63bef443142201f07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:09 -0400
Subject: [PATCH 0181/1118] python3-dbusmock: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-dbusmock/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template
index d8330a210c0..fec8c097526 100644
--- a/srcpkgs/python3-dbusmock/template
+++ b/srcpkgs/python3-dbusmock/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-dbusmock'
 pkgname=python3-dbusmock
 version=0.19
-revision=1
-archs=noarch
+revision=2
 wrksrc="python-dbusmock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f73a7f8e4ce2e8c75b95f27a9c613ed3a748604b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:09 -0400
Subject: [PATCH 0182/1118] python3-deprecation: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-deprecation/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-deprecation/template b/srcpkgs/python3-deprecation/template
index 5983a0aadbf..0c8664ddd6d 100644
--- a/srcpkgs/python3-deprecation/template
+++ b/srcpkgs/python3-deprecation/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-deprecation'
 pkgname=python3-deprecation
 version=2.1.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="deprecation-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cd13bd3b38c4271c527556d734c77937e3bc207d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:10 -0400
Subject: [PATCH 0183/1118] python3-discid: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-discid/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-discid/template b/srcpkgs/python3-discid/template
index de3f5e571db..850aa859fcd 100644
--- a/srcpkgs/python3-discid/template
+++ b/srcpkgs/python3-discid/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-discid'
 pkgname=python3-discid
 version=1.2.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="discid-${version}"
 build_style=python3-module
 pycompile_module=discid

From 5a4808e08089a2bc206fd6f1f3b91eba6d660806 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:10 -0400
Subject: [PATCH 0184/1118] python3-dogpile.cache: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-dogpile.cache/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-dogpile.cache/template b/srcpkgs/python3-dogpile.cache/template
index 9e8a6a2465e..2060330d489 100644
--- a/srcpkgs/python3-dogpile.cache/template
+++ b/srcpkgs/python3-dogpile.cache/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-dogpile.cache'
 pkgname=python3-dogpile.cache
 version=1.0.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="dogpile.cache-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 95b5a933db6f4c3fb6a8eada15eb07cae5225933 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:10 -0400
Subject: [PATCH 0185/1118] python3-doi: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-doi/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-doi/template b/srcpkgs/python3-doi/template
index 29b9036922c..acd3b05c84d 100644
--- a/srcpkgs/python3-doi/template
+++ b/srcpkgs/python3-doi/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-doi'
 pkgname=python3-doi
 version=0.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="python-doi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a5e4d31ace9f6ed258852acae5f4f01469346a63 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:10 -0400
Subject: [PATCH 0186/1118] python3-dotenv: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-dotenv/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-dotenv/template b/srcpkgs/python3-dotenv/template
index b771ad0139d..afaa0c5569b 100644
--- a/srcpkgs/python3-dotenv/template
+++ b/srcpkgs/python3-dotenv/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-dotenv'
 pkgname=python3-dotenv
 version=0.14.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="python-dotenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1bece6e16403566a7c2c4171d26fe555e9b49d91 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:10 -0400
Subject: [PATCH 0187/1118] python3-dpkt: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-dpkt/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-dpkt/template b/srcpkgs/python3-dpkt/template
index 5ca1a6b1dbb..e5f3ed15758 100644
--- a/srcpkgs/python3-dpkt/template
+++ b/srcpkgs/python3-dpkt/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-dpkt'
 pkgname=python3-dpkt
 version=1.9.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="dpkt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a12fd70c6b9735a7bc72d68bb4c6d36f3d6df6a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:11 -0400
Subject: [PATCH 0188/1118] python3-easygui: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-easygui/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-easygui/template b/srcpkgs/python3-easygui/template
index a9a2f66d865..27bc2fb0e02 100644
--- a/srcpkgs/python3-easygui/template
+++ b/srcpkgs/python3-easygui/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-easygui'
 pkgname=python3-easygui
 version=0.98.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="easygui-${version}"
 build_style=python3-module
 pycompile_module="easygui"

From b27216b2d53c6718b5b36340187cdc992ccecc14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:11 -0400
Subject: [PATCH 0189/1118] python3-eliot: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-eliot/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template
index eca2c769d45..0cbb23eb418 100644
--- a/srcpkgs/python3-eliot/template
+++ b/srcpkgs/python3-eliot/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-eliot'
 pkgname=python3-eliot
 version=1.12.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="eliot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4c59e47be537db309c862cb3a3e1f35adf1851a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:11 -0400
Subject: [PATCH 0190/1118] python3-enchant: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-enchant/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template
index 1540cc34bc8..cb44e98880b 100644
--- a/srcpkgs/python3-enchant/template
+++ b/srcpkgs/python3-enchant/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-enchant'
 pkgname=python3-enchant
 version=3.1.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="pyenchant-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools enchant-devel"

From 683f9bee5fbb602028eb2d5e515c65d8c6f2456e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:11 -0400
Subject: [PATCH 0191/1118] python3-ffmpeg-python: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-ffmpeg-python/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ffmpeg-python/template b/srcpkgs/python3-ffmpeg-python/template
index 137a864711f..a23624b27b9 100644
--- a/srcpkgs/python3-ffmpeg-python/template
+++ b/srcpkgs/python3-ffmpeg-python/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-ffmpeg-python'
 pkgname=python3-ffmpeg-python
 version=0.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="ffmpeg-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3c2ad83ea920a1d2ddbf8241cf3eeb57b8996bdc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:11 -0400
Subject: [PATCH 0192/1118] python3-fido2: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-fido2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template
index fcf8a219ca2..c489c0ad612 100644
--- a/srcpkgs/python3-fido2/template
+++ b/srcpkgs/python3-fido2/template
@@ -2,8 +2,7 @@
 pkgname=python3-fido2
 _pkgname=fido2
 version=0.8.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 365787209082f147abbcab5d0b37b7265026e90e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:11 -0400
Subject: [PATCH 0193/1118] python3-filebytes: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-filebytes/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-filebytes/template b/srcpkgs/python3-filebytes/template
index 8a7236c705a..c642ed52b99 100644
--- a/srcpkgs/python3-filebytes/template
+++ b/srcpkgs/python3-filebytes/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-filebytes'
 pkgname=python3-filebytes
 version=0.10.2
-revision=1
-archs="noarch"
+revision=2
 wrksrc="filebytes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 14ba79af2fa135aa9c495084806c7d02d1aedf2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:12 -0400
Subject: [PATCH 0194/1118] python3-fishnet: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-fishnet/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-fishnet/template b/srcpkgs/python3-fishnet/template
index 6280ae8e966..8c802e94d86 100644
--- a/srcpkgs/python3-fishnet/template
+++ b/srcpkgs/python3-fishnet/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-fishnet'
 pkgname=python3-fishnet
 version=1.15.18
-revision=2
-archs=noarch
+revision=3
 wrksrc="fishnet-${version}"
 build_style=python3-module
 pycompile_module="fishnet.py"

From 696a858fbba638a7af5bb8a2a6d62c804de6f38c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:12 -0400
Subject: [PATCH 0195/1118] python3-flexmock: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-flexmock/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-flexmock/template b/srcpkgs/python3-flexmock/template
index 8a7c9a2894d..84d35597aac 100644
--- a/srcpkgs/python3-flexmock/template
+++ b/srcpkgs/python3-flexmock/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-flexmock'
 pkgname=python3-flexmock
 version=0.10.4
-revision=2
-archs=noarch
+revision=3
 wrksrc="flexmock-${version}"
 build_style=python3-module
 pycompile_module="flexmock.py"

From 4225acdf4a580144b1cd00627e6a5ef8efc0f3ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:12 -0400
Subject: [PATCH 0196/1118] python3-freezegun: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-freezegun/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-freezegun/template b/srcpkgs/python3-freezegun/template
index d8c96e1f1c6..9051f9e3b64 100644
--- a/srcpkgs/python3-freezegun/template
+++ b/srcpkgs/python3-freezegun/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-freezegun'
 pkgname=python3-freezegun
 version=0.3.15
-revision=1
-archs=noarch
+revision=2
 wrksrc="freezegun-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 100bd79aad3c867bbcc8f031107ca768454f0f4a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:12 -0400
Subject: [PATCH 0197/1118] python3-frozendict: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-frozendict/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 739000a887c..3f43b3945b4 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
 version=1.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="frozendict-${version}"
 build_style=python3-module
 pycompile_module="frozendict"

From ec7e731e5676ce8216e9af43699ca94b97efabab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:12 -0400
Subject: [PATCH 0198/1118] python3-furl: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-furl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-furl/template b/srcpkgs/python3-furl/template
index 5fc53ba21de..0ca409a6f85 100644
--- a/srcpkgs/python3-furl/template
+++ b/srcpkgs/python3-furl/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-furl'
 pkgname=python3-furl
 version=2.1.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="furl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f7a755c45a4f1a2b819c9d4012daf27cc66c8123 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:13 -0400
Subject: [PATCH 0199/1118] python3-geojson: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-geojson/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-geojson/template b/srcpkgs/python3-geojson/template
index 90e7d5a0e60..fe456fa2ad3 100644
--- a/srcpkgs/python3-geojson/template
+++ b/srcpkgs/python3-geojson/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-geojson'
 pkgname=python3-geojson
 version=2.5.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="geojson-${version}"
 build_style=python3-module
 pycompile_module="geojson"

From 35b42b9a6a5b6aecd79e9de9f325dfe8b7c63491 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:13 -0400
Subject: [PATCH 0200/1118] python3-gitchangelog: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-gitchangelog/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template
index cc1945f2623..c62eecee9a4 100644
--- a/srcpkgs/python3-gitchangelog/template
+++ b/srcpkgs/python3-gitchangelog/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-gitchangelog'
 pkgname=python3-gitchangelog
 version=3.0.4
-revision=2
-archs=noarch
+revision=3
 wrksrc="gitchangelog-${version}"
 build_style=python3-module
 pycompile_module="gitchangelog"

From 40327a86f9179114a0961ec19423389f61496a7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:13 -0400
Subject: [PATCH 0201/1118] python3-graphviz: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-graphviz/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-graphviz/template b/srcpkgs/python3-graphviz/template
index 2e7ec3bd76a..f5a0cf20652 100644
--- a/srcpkgs/python3-graphviz/template
+++ b/srcpkgs/python3-graphviz/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-graphviz'
 pkgname=python3-graphviz
 version=0.13.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 pycompile_module="graphviz"

From 54c84febbb89361251d386f05b5a41e9626deef0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:13 -0400
Subject: [PATCH 0202/1118] python3-hawkauthlib: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-hawkauthlib/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hawkauthlib/template b/srcpkgs/python3-hawkauthlib/template
index 1456fa7d814..aadb5c2a40d 100644
--- a/srcpkgs/python3-hawkauthlib/template
+++ b/srcpkgs/python3-hawkauthlib/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-hawkauthlib'
 pkgname=python3-hawkauthlib
 version=2.0.0
-revision=3
-archs=noarch
+revision=4
 wrksrc="hawkauthlib-${version}"
 build_style=python3-module
 pycompile_module="hawkauthlib"

From ec65c3748e7cb154ad00921874487faf235df828 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:13 -0400
Subject: [PATCH 0203/1118] python3-hjson: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-hjson/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hjson/template b/srcpkgs/python3-hjson/template
index 9cd01b86f08..628c19d82e3 100644
--- a/srcpkgs/python3-hjson/template
+++ b/srcpkgs/python3-hjson/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-hjson'
 pkgname=python3-hjson
 version=3.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="hjson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 59932acf82ce9d49e285bc697e2899969335a6f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:14 -0400
Subject: [PATCH 0204/1118] python3-hkdf: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-hkdf/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hkdf/template b/srcpkgs/python3-hkdf/template
index 0faaf05b5fe..b202a4adbf0 100644
--- a/srcpkgs/python3-hkdf/template
+++ b/srcpkgs/python3-hkdf/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-hkdf'
 pkgname=python3-hkdf
 version=0.0.3
-revision=2
-archs=noarch
+revision=3
 wrksrc="hkdf-${version}"
 build_style=python3-module
 pycompile_module="hkdf.py"

From 540c2b0f1a4fdb46f4f3ac4fe2451db6b45492b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:14 -0400
Subject: [PATCH 0205/1118] python3-html2text: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-html2text/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-html2text/template b/srcpkgs/python3-html2text/template
index 54e9dab354b..5adc859fcc8 100644
--- a/srcpkgs/python3-html2text/template
+++ b/srcpkgs/python3-html2text/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-html2text'
 pkgname=python3-html2text
 version=2020.1.16
-revision=2
-archs=noarch
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 pycompile_module="html2text"

From 30f46ea9aa7c3d4067c02fe1e4344f2eea4966a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:14 -0400
Subject: [PATCH 0206/1118] python3-humanize: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-humanize/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-humanize/template b/srcpkgs/python3-humanize/template
index cbf4398d976..16c3f2b99e5 100644
--- a/srcpkgs/python3-humanize/template
+++ b/srcpkgs/python3-humanize/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-humanize'
 pkgname=python3-humanize
 version=2.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="humanize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8e141e0dc522a79b7ae4c4efe737214c3d2c44ab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:14 -0400
Subject: [PATCH 0207/1118] python3-i3ipc: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-i3ipc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-i3ipc/template b/srcpkgs/python3-i3ipc/template
index df0c16a161b..d7cc59ed26e 100644
--- a/srcpkgs/python3-i3ipc/template
+++ b/srcpkgs/python3-i3ipc/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-i3ipc'
 pkgname=python3-i3ipc
 version=2.2.1
-revision=3
-archs=noarch
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 672758edb8dcbe4262b6309bf87f186a5ceba32e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:14 -0400
Subject: [PATCH 0208/1118] python3-idna-ssl: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-idna-ssl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-idna-ssl/template b/srcpkgs/python3-idna-ssl/template
index 0608fb7278c..82dd5c51ce6 100644
--- a/srcpkgs/python3-idna-ssl/template
+++ b/srcpkgs/python3-idna-ssl/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-idna-ssl'
 pkgname=python3-idna-ssl
 version=1.1.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="idna-ssl-${version}"
 build_style=python3-module
 pycompile_module="idna_ssl.py"

From 9317be3ed7150849be7f67334c75531299e8fc2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:14 -0400
Subject: [PATCH 0209/1118] python3-ifaddr: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-ifaddr/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ifaddr/template b/srcpkgs/python3-ifaddr/template
index 803404735be..3e749f77ec1 100644
--- a/srcpkgs/python3-ifaddr/template
+++ b/srcpkgs/python3-ifaddr/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-ifaddr'
 pkgname=python3-ifaddr
 version=0.1.7
-revision=1
-archs=noarch
+revision=2
 wrksrc="ifaddr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 707a69972e7a427cf42bfe2f3e0d92207317a925 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:15 -0400
Subject: [PATCH 0210/1118] python3-influxdb: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-influxdb/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-influxdb/template b/srcpkgs/python3-influxdb/template
index 366eea281af..926dd8ce29a 100644
--- a/srcpkgs/python3-influxdb/template
+++ b/srcpkgs/python3-influxdb/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-influxdb'
 pkgname=python3-influxdb
 version=5.3.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python-setuptools"

From deeed1c9542912e2db24d5aed4cf6f37a5c9aac7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:15 -0400
Subject: [PATCH 0211/1118] python3-ipython: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-ipython/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index a7ae6892e7e..c74b9c997b1 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
 version=7.18.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="ipython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5425390d1b4f75cd225e73d7d35224e9178f1406 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:15 -0400
Subject: [PATCH 0212/1118] python3-ipython_genutils: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-ipython_genutils/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython_genutils/template b/srcpkgs/python3-ipython_genutils/template
index b2754424178..5686c3f5811 100644
--- a/srcpkgs/python3-ipython_genutils/template
+++ b/srcpkgs/python3-ipython_genutils/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-ipython_genutils'
 pkgname=python3-ipython_genutils
 version=0.2.0
-revision=4
-archs=noarch
+revision=5
 wrksrc="ipython_genutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3b1e707f2156d46bc20a89417a6cbfed42ab2a2b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:15 -0400
Subject: [PATCH 0213/1118] python3-ipython_ipykernel: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-ipython_ipykernel/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index c3c0232c14a..36ef97f08d7 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-ipython_ipykernel'
 pkgname=python3-ipython_ipykernel
 version=5.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="ipykernel-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-ipython

From f76b0e27aec889bca5fa905f4d9e438770a9df68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:15 -0400
Subject: [PATCH 0214/1118] python3-irc: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-irc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-irc/template b/srcpkgs/python3-irc/template
index 714c11dc943..f35356ccbe7 100644
--- a/srcpkgs/python3-irc/template
+++ b/srcpkgs/python3-irc/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-irc'
 pkgname=python3-irc
 version=17.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="irc-${version}"
 build_style=python3-module
 pycompile_module="irc"

From 1549f66335d8c2b52061e6a90b9f097cd66c0677 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:16 -0400
Subject: [PATCH 0215/1118] python3-itunespy: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-itunespy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-itunespy/template b/srcpkgs/python3-itunespy/template
index 7a04a945dbd..5a80c11c93a 100644
--- a/srcpkgs/python3-itunespy/template
+++ b/srcpkgs/python3-itunespy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-itunespy'
 pkgname=python3-itunespy
 version=1.6
-revision=1
-archs=noarch
+revision=2
 wrksrc="itunespy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1564252ba15667418134c6a81b0045dcf1f7510f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:16 -0400
Subject: [PATCH 0216/1118] python3-janus: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-janus/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-janus/template b/srcpkgs/python3-janus/template
index b7388d96975..9cd15ccf648 100644
--- a/srcpkgs/python3-janus/template
+++ b/srcpkgs/python3-janus/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-janus'
 pkgname=python3-janus
 version=0.5.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="janus-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f655ad61d2dafe970a90ec2955a24f1facca159c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:16 -0400
Subject: [PATCH 0217/1118] python3-jaraco: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-jaraco/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco/template b/srcpkgs/python3-jaraco/template
index d6ab6b23228..8b6e8a695ea 100644
--- a/srcpkgs/python3-jaraco/template
+++ b/srcpkgs/python3-jaraco/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jaraco'
 pkgname=python3-jaraco
 version=1.0
-revision=1
-archs=noarch
+revision=2
 create_wrksrc=yes
 short_desc="Namespace package declaration for jaraco (Python3)"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"

From a0b05818fcb4ec1c6ddf7b7fdb1fa92e0003a7d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:16 -0400
Subject: [PATCH 0218/1118] python3-jaraco.classes: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jaraco.classes/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.classes/template b/srcpkgs/python3-jaraco.classes/template
index 6dbe89cb7f9..a7dd48bd5cd 100644
--- a/srcpkgs/python3-jaraco.classes/template
+++ b/srcpkgs/python3-jaraco.classes/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jaraco.classes'
 pkgname=python3-jaraco.classes
 version=3.1.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="jaraco.classes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4b40076dd1fcbfc486bcd3f6da28e075bf6ee4e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:16 -0400
Subject: [PATCH 0219/1118] python3-jaraco.collections: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jaraco.collections/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template
index 64f78eb4300..68ee5f3c353 100644
--- a/srcpkgs/python3-jaraco.collections/template
+++ b/srcpkgs/python3-jaraco.collections/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jaraco.collections'
 pkgname=python3-jaraco.collections
 version=3.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="jaraco.collections-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fb28b05eb0193c71ca7510ba4271cb1de50b903c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:16 -0400
Subject: [PATCH 0220/1118] python3-jaraco.functools: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jaraco.functools/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.functools/template b/srcpkgs/python3-jaraco.functools/template
index ca1ebb066d5..bedec81e130 100644
--- a/srcpkgs/python3-jaraco.functools/template
+++ b/srcpkgs/python3-jaraco.functools/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jaraco.functools'
 pkgname=python3-jaraco.functools
 version=3.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="jaraco.functools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c2a954fb037f36206ab788931320c40227b751ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:17 -0400
Subject: [PATCH 0221/1118] python3-jaraco.text: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-jaraco.text/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template
index a64ba0db7cb..ffe2f5bb1ab 100644
--- a/srcpkgs/python3-jaraco.text/template
+++ b/srcpkgs/python3-jaraco.text/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jaraco.text'
 pkgname=python3-jaraco.text
 version=3.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="jaraco.text-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d941ed5377442cd7dd3435abb28788e492dbe4c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:17 -0400
Subject: [PATCH 0222/1118] python3-jeepney: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-jeepney/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jeepney/template b/srcpkgs/python3-jeepney/template
index 6654f4a7c97..cf9937a8d6f 100644
--- a/srcpkgs/python3-jeepney/template
+++ b/srcpkgs/python3-jeepney/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jeepney'
 pkgname=python3-jeepney
 version=0.4.3
-revision=1
-archs=noarch
+revision=2
 wrksrc="jeepney-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From e62656755453fc87fbf9ea12fb7d06cd293d2a4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:17 -0400
Subject: [PATCH 0223/1118] python3-jsonrpc-server: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jsonrpc-server/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template
index b51e185efe9..406f38b8628 100644
--- a/srcpkgs/python3-jsonrpc-server/template
+++ b/srcpkgs/python3-jsonrpc-server/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jsonrpc-server'
 pkgname=python3-jsonrpc-server
 version=0.3.4
-revision=2
-archs=noarch
+revision=3
 wrksrc="${pkgname/3}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 977933dee5064ae7f414bd689d0705d2112dbae5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:18 -0400
Subject: [PATCH 0224/1118] python3-jupyter_core: rebuild for Python 3.9, drop
 noarch, split python3-jupyter

A python3-jupyter meta-subpackage was included in python3-jupyter_core
and created a build-time dependency cycle. The cycle is resolved by
separating python3-jupyter into its own template.
---
 srcpkgs/python3-jupyter               |  1 -
 srcpkgs/python3-jupyter/template      | 12 ++++++++++++
 srcpkgs/python3-jupyter_core/template | 11 +----------
 3 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/python3-jupyter
 create mode 100644 srcpkgs/python3-jupyter/template

diff --git a/srcpkgs/python3-jupyter b/srcpkgs/python3-jupyter
deleted file mode 120000
index d348df87da4..00000000000
--- a/srcpkgs/python3-jupyter
+++ /dev/null
@@ -1 +0,0 @@
-python3-jupyter_core
\ No newline at end of file
diff --git a/srcpkgs/python3-jupyter/template b/srcpkgs/python3-jupyter/template
new file mode 100644
index 00000000000..58c34884363
--- /dev/null
+++ b/srcpkgs/python3-jupyter/template
@@ -0,0 +1,12 @@
+# Template file for 'python3-jupyter'
+# 
+# THIS PACKAGE WAS SPLIT FROM python3-jupyter_core TO AVOID A DEPENDENCY CYCLE
+pkgname=python3-jupyter
+version=4.6.3
+revision=2
+build_style=meta
+depends="python3-jupyter_notebook python3-jupyter_console python3-jupyter_ipywidgets"
+short_desc="Jupyter metapackage for Void Linux"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://jupyter.org"
diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template
index ea75fa510a7..413be27873f 100644
--- a/srcpkgs/python3-jupyter_core/template
+++ b/srcpkgs/python3-jupyter_core/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_core'
 pkgname=python3-jupyter_core
 version=4.6.3
-revision=1
-archs=noarch
+revision=2
 wrksrc="jupyter_core-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -24,11 +23,3 @@ do_check() {
 post_install() {
 	vlicense COPYING.md LICENSE
 }
-
-python3-jupyter_package() {
-	build_style=meta
-	archs=noarch
-	depends="python3-jupyter_notebook python3-jupyter_console
-	 python3-jupyter_ipywidgets"
-	short_desc="Jupyter metapackage for Void Linux"
-}

From a848e9bb427052f2d53e7ed5f36e8f9a1c537ff4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:17 -0400
Subject: [PATCH 0225/1118] python3-jupyter_client: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jupyter_client/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template
index 6cba34ab0b8..9dc13b8a261 100644
--- a/srcpkgs/python3-jupyter_client/template
+++ b/srcpkgs/python3-jupyter_client/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_client'
 pkgname=python3-jupyter_client
 version=6.1.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="jupyter_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From eb344b954df3e8092a2ee1df2ebd6a2254a8d0d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:17 -0400
Subject: [PATCH 0226/1118] python3-jupyter_console: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jupyter_console/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template
index 4b404987cd8..f491e1640f5 100644
--- a/srcpkgs/python3-jupyter_console/template
+++ b/srcpkgs/python3-jupyter_console/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_console'
 pkgname=python3-jupyter_console
 version=6.1.0
-revision=4
-archs=noarch
+revision=5
 wrksrc="jupyter_console-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f92bfca26b5ec69bdc0af82a2c34a5bd6180dd96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:18 -0400
Subject: [PATCH 0227/1118] python3-jupyter_ipywidgets: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jupyter_ipywidgets/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template
index 7e64279aeec..fa38f1632a8 100644
--- a/srcpkgs/python3-jupyter_ipywidgets/template
+++ b/srcpkgs/python3-jupyter_ipywidgets/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_ipywidgets'
 pkgname=python3-jupyter_ipywidgets
 version=7.5.1
-revision=1
-archs=noarch
+revision=2
 _widgetsnbextver=3.5.0
 wrksrc="ipywidgets-${version}"
 build_style=python3-module

From f99586ef2b324e2c62d7137767235d6bf0359ee3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:18 -0400
Subject: [PATCH 0228/1118] python3-jupyter_nbconvert: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jupyter_nbconvert/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index dba1d5a980e..fd3a2757635 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
 version=5.6.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="nbconvert-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 99d3bc8d11e64d1dfb1c1da1eefe3ec0f567115f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:18 -0400
Subject: [PATCH 0229/1118] python3-jupyter_nbformat: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jupyter_nbformat/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index a46c5697212..4a04f11f5fb 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
 version=5.0.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 57b0e87ea0766e4fc29d09f912e98631784be742 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:18 -0400
Subject: [PATCH 0230/1118] python3-jupyter_notebook: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jupyter_notebook/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index cc1727d2ee0..c7a8b2d0390 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_notebook'
 pkgname=python3-jupyter_notebook
 version=6.0.3
-revision=1
-archs=noarch
+revision=2
 wrksrc="notebook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 53db446136eda728da28c915d5e5a6d994971f41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:18 -0400
Subject: [PATCH 0231/1118] python3-jupyter_qtconsole: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-jupyter_qtconsole/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_qtconsole/template b/srcpkgs/python3-jupyter_qtconsole/template
index 0c062662763..c7414fde43e 100644
--- a/srcpkgs/python3-jupyter_qtconsole/template
+++ b/srcpkgs/python3-jupyter_qtconsole/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_qtconsole'
 pkgname=python3-jupyter_qtconsole
 version=4.7.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="qtconsole-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e4584e3875bcd225622d86c87d9aee92e704d9b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:19 -0400
Subject: [PATCH 0232/1118] python3-jupyter_widgetsnbextension: rebuild for
 Python 3.9, drop noarch

---
 srcpkgs/python3-jupyter_widgetsnbextension/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template
index e1fe046894c..06918c86c6d 100644
--- a/srcpkgs/python3-jupyter_widgetsnbextension/template
+++ b/srcpkgs/python3-jupyter_widgetsnbextension/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-jupyter_widgetsnbextension'
 pkgname=python3-jupyter_widgetsnbextension
 version=3.5.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="widgetsnbextension-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9cdf0ee32a152936b49aa6fba2986a3525c30d32 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:19 -0400
Subject: [PATCH 0233/1118] python3-keyring: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-keyring/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 97e10618eee..34b73a55048 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
 version=21.2.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="keyring-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cac66071927bf6b3224bb9b9204b8e19cd4d0ac5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:19 -0400
Subject: [PATCH 0234/1118] python3-keyrings-alt: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-keyrings-alt/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-keyrings-alt/template b/srcpkgs/python3-keyrings-alt/template
index 3052d257d1c..fe3008caafd 100644
--- a/srcpkgs/python3-keyrings-alt/template
+++ b/srcpkgs/python3-keyrings-alt/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-keyrings-alt'
 pkgname=python3-keyrings-alt
 version=3.4.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="keyrings.alt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 40230a63fb0afa691e39edb0dc86fd28eb6bff35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:19 -0400
Subject: [PATCH 0235/1118] python3-language-server: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-language-server/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
index 8ac0842f3b9..0e5fed16ec3 100644
--- a/srcpkgs/python3-language-server/template
+++ b/srcpkgs/python3-language-server/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-language-server'
 pkgname=python3-language-server
 version=0.34.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="${pkgname/3}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e93326acd876255001ee010c9e82fa058631f3f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:19 -0400
Subject: [PATCH 0236/1118] python3-macaroons: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-macaroons/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 7dfb4f3f588..94ee7e21d59 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-macaroons'
 pkgname=python3-macaroons
 version=0.13.0
-revision=3
-archs=noarch
+revision=4
 wrksrc="pymacaroons-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6b6302f1cdc1d45ef846d5775527ee17a830d1d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:20 -0400
Subject: [PATCH 0237/1118] python3-macholib: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-macholib/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-macholib/template b/srcpkgs/python3-macholib/template
index 5e65f7993dd..03ac5ff6dc6 100644
--- a/srcpkgs/python3-macholib/template
+++ b/srcpkgs/python3-macholib/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-macholib'
 pkgname=python3-macholib
 version=1.14
-revision=1
-archs=noarch
+revision=2
 wrksrc="macholib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4ab7245f00bd593b820c4f00d78e52eee547af53 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:20 -0400
Subject: [PATCH 0238/1118] python3-markdown-math: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-markdown-math/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-markdown-math/template b/srcpkgs/python3-markdown-math/template
index b49d58dd79c..a10754b4117 100644
--- a/srcpkgs/python3-markdown-math/template
+++ b/srcpkgs/python3-markdown-math/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-markdown-math'
 pkgname=python3-markdown-math
 version=0.7
-revision=1
-archs=noarch
+revision=2
 wrksrc=python-markdown-math-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a0b7a68cfa0b1363cf9834bc948cb69c899ccecc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:20 -0400
Subject: [PATCH 0239/1118] python3-marshmallow: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-marshmallow/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-marshmallow/template b/srcpkgs/python3-marshmallow/template
index 2a3b2329389..773b473cb23 100644
--- a/srcpkgs/python3-marshmallow/template
+++ b/srcpkgs/python3-marshmallow/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-marshmallow'
 pkgname=python3-marshmallow
 version=3.7.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="marshmallow-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cd9a1382c48a8b9991a7034220dd0f907e2cc37f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:20 -0400
Subject: [PATCH 0240/1118] python3-minidb: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-minidb/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-minidb/template b/srcpkgs/python3-minidb/template
index 140964b7a8a..b7b24fe1635 100644
--- a/srcpkgs/python3-minidb/template
+++ b/srcpkgs/python3-minidb/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-minidb'
 pkgname=python3-minidb
 version=2.0.2
-revision=3
-archs=noarch
+revision=4
 wrksrc="minidb-${version}"
 build_style=python3-module
 pycompile_module="minidb.py"

From 6063be92e3b52a4f5b6be2bbe2e616b44719d16f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:20 -0400
Subject: [PATCH 0241/1118] python3-mock: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-mock/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mock/template b/srcpkgs/python3-mock/template
index 5506d4a70c2..4086b2b1218 100644
--- a/srcpkgs/python3-mock/template
+++ b/srcpkgs/python3-mock/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-mock'
 pkgname=python3-mock
 version=4.0.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="mock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5c5509555f2ebf543017a7d28b1511a7e001e5bb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:20 -0400
Subject: [PATCH 0242/1118] python3-mpv: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-mpv/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template
index 984b7baa224..dd630c896b8 100644
--- a/srcpkgs/python3-mpv/template
+++ b/srcpkgs/python3-mpv/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-mpv'
 pkgname=python3-mpv
 version=0.4.5
-revision=1
-archs=noarch
+revision=2
 wrksrc="python-mpv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 89c537315d4e2b3579920e351116c4cdd93df9a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:21 -0400
Subject: [PATCH 0243/1118] python3-munkres: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-munkres/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-munkres/template b/srcpkgs/python3-munkres/template
index d0d0a013e80..22cd0887652 100644
--- a/srcpkgs/python3-munkres/template
+++ b/srcpkgs/python3-munkres/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-munkres'
 pkgname=python3-munkres
 version=1.1.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="munkres-release-${version}"
 build_style=python3-module
 pycompile_module="munkres.py"

From e6459878ae96248ca0668c4e9ee49318bceebe30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:21 -0400
Subject: [PATCH 0244/1118] python3-musicpd: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-musicpd/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-musicpd/template b/srcpkgs/python3-musicpd/template
index 8c6ba2fb451..8b1d23a9826 100644
--- a/srcpkgs/python3-musicpd/template
+++ b/srcpkgs/python3-musicpd/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-musicpd'
 pkgname=python3-musicpd
 version=0.4.4
-revision=2
-archs=noarch
+revision=3
 wrksrc="python-musicpd-${version}"
 build_style=python3-module
 pycompile_module="musicpd.py"

From 103d072d9427ecd88e628ad1cba051638e92eedc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:21 -0400
Subject: [PATCH 0245/1118] python3-mypy: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-mypy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 5d7f93d5772..6fef0e9f8c0 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
 version=0.761
-revision=1
-archs=noarch
+revision=2
 wrksrc="mypy-${version}"
 build_style=python3-module
 pycompile_module="mypy"

From 7963150f93e9f6df9b710ddaff8e72725b692b8f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:21 -0400
Subject: [PATCH 0246/1118] python3-mypy_extensions: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-mypy_extensions/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mypy_extensions/template b/srcpkgs/python3-mypy_extensions/template
index e2d12256de5..6aa9229a9fc 100644
--- a/srcpkgs/python3-mypy_extensions/template
+++ b/srcpkgs/python3-mypy_extensions/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-mypy_extensions'
 pkgname=python3-mypy_extensions
 version=0.4.3
-revision=2
-archs=noarch
+revision=3
 wrksrc="mypy_extensions-${version}"
 build_style=python3-module
 pycompile_module="mypy_extensions.py"

From 45de17b8bd46c784cf7169909a053a2d5ce7463a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:21 -0400
Subject: [PATCH 0247/1118] python3-neovim: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-neovim/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-neovim/template b/srcpkgs/python3-neovim/template
index b5c705bbafd..eae1c4decbc 100644
--- a/srcpkgs/python3-neovim/template
+++ b/srcpkgs/python3-neovim/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-neovim'
 pkgname=python3-neovim
 version=0.4.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="pynvim-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 15f0e30ee0a25d25c65594a00c01f2a3b9a72c2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:22 -0400
Subject: [PATCH 0248/1118] python3-notify2: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-notify2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-notify2/template b/srcpkgs/python3-notify2/template
index 8416e98cc32..051fcee017f 100644
--- a/srcpkgs/python3-notify2/template
+++ b/srcpkgs/python3-notify2/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-notify2'
 pkgname=python3-notify2
 version=0.3.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="notify2-${version}"
 build_style=python3-module
 hostmakedepends="python3"

From d6988c5cd7cd84b5eece51a51f22292e79351291 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:22 -0400
Subject: [PATCH 0249/1118] python3-ntlm-auth: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-ntlm-auth/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ntlm-auth/template b/srcpkgs/python3-ntlm-auth/template
index fc9746b14aa..fbbd886187f 100644
--- a/srcpkgs/python3-ntlm-auth/template
+++ b/srcpkgs/python3-ntlm-auth/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-ntlm-auth'
 pkgname=python3-ntlm-auth
 version=1.5.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="ntlm-auth-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2c3b84ecf751d027127ab4365a3c9fdbada6ffb7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:22 -0400
Subject: [PATCH 0250/1118] python3-oletools: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-oletools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 4f730e7ebe7..9da4f8d26cf 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
 version=0.56
-revision=1
+revision=2
 wrksrc="oletools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 266773f35ca5a1bd0344f128e03c250f9bf30945 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:22 -0400
Subject: [PATCH 0251/1118] python3-orderedmultidict: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-orderedmultidict/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-orderedmultidict/template b/srcpkgs/python3-orderedmultidict/template
index e6df82104cd..7e8c5e0043b 100644
--- a/srcpkgs/python3-orderedmultidict/template
+++ b/srcpkgs/python3-orderedmultidict/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-orderedmultidict'
 pkgname=python3-orderedmultidict
 version=1.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="orderedmultidict-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d74d0678c1c2d9de56dde94bc0ab761f1f666a7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:22 -0400
Subject: [PATCH 0252/1118] python3-pamqp: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pamqp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pamqp/template b/srcpkgs/python3-pamqp/template
index 8c66eb482de..e995e55f27a 100644
--- a/srcpkgs/python3-pamqp/template
+++ b/srcpkgs/python3-pamqp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pamqp'
 pkgname=python3-pamqp
 version=2.3.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 07ce67d8d523c364ac7c110a3fc1d90d39defce9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:22 -0400
Subject: [PATCH 0253/1118] python3-parsedatetime: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-parsedatetime/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-parsedatetime/template b/srcpkgs/python3-parsedatetime/template
index 71855b7c3ff..3ce0cde30dc 100644
--- a/srcpkgs/python3-parsedatetime/template
+++ b/srcpkgs/python3-parsedatetime/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-parsedatetime'
 pkgname=python3-parsedatetime
 version=2.6
-revision=1
-archs=noarch
+revision=2
 wrksrc="parsedatetime-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0d22236c8f69c14e4a7a1ed1931eeeb7d7f1d83a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:23 -0400
Subject: [PATCH 0254/1118] python3-path-and-address: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-path-and-address/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-path-and-address/template b/srcpkgs/python3-path-and-address/template
index 5c6825009ec..086457de3a9 100644
--- a/srcpkgs/python3-path-and-address/template
+++ b/srcpkgs/python3-path-and-address/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-path-and-address'
 pkgname=python3-path-and-address
 version=2.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="path-and-address-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8a203ff8bef5a154d8931a6d16a2b700f3d64ed2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:23 -0400
Subject: [PATCH 0255/1118] python3-pcodedmp: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pcodedmp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pcodedmp/template b/srcpkgs/python3-pcodedmp/template
index eb52c809fae..a479c31fcc7 100644
--- a/srcpkgs/python3-pcodedmp/template
+++ b/srcpkgs/python3-pcodedmp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pcodedmp'
 pkgname=python3-pcodedmp
 version=1.2.6
-revision=2
-archs=noarch
+revision=3
 wrksrc="pcodedmp-${version}"
 build_style=python3-module
 pycompile_module="pcodedmp"

From 8a15939f67efa89a7cb22d6ce181328441b4b688 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:23 -0400
Subject: [PATCH 0256/1118] python3-pefile: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pefile/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pefile/template b/srcpkgs/python3-pefile/template
index 8791f06640b..4d82cfafe16 100644
--- a/srcpkgs/python3-pefile/template
+++ b/srcpkgs/python3-pefile/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pefile'
 pkgname=python3-pefile
 version=2019.4.18
-revision=2
-archs=noarch
+revision=3
 wrksrc="pefile-${version}"
 build_style=python3-module
 pycompile_module="pefile.py peutils.py ordlookup"

From 5d003ed8e1fcf8c3b25aa6029d9871609b8ae727 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:23 -0400
Subject: [PATCH 0257/1118] python3-pem: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pem/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pem/template b/srcpkgs/python3-pem/template
index ad51601c006..6682e156dc2 100644
--- a/srcpkgs/python3-pem/template
+++ b/srcpkgs/python3-pem/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pem'
 pkgname=python3-pem
 version=19.3.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="pem-${version}"
 build_style=python3-module
 pycompile_module="pem"

From f62e762fa9a813e171c0f4d89b0877f32e2f25b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:23 -0400
Subject: [PATCH 0258/1118] python3-perf: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-perf/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-perf/template b/srcpkgs/python3-perf/template
index dff80be01bc..40918d7d97a 100644
--- a/srcpkgs/python3-perf/template
+++ b/srcpkgs/python3-perf/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-perf'
 pkgname=python3-perf
 version=1.7.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="pyperf-${version}"
 build_style=python3-module
 pycompile_module="pyperf"

From ecbf2f8b40378a7131f65d96b06646ec30630d68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:24 -0400
Subject: [PATCH 0259/1118] python3-pgspecial: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pgspecial/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pgspecial/template b/srcpkgs/python3-pgspecial/template
index 34b660dfc07..1f5abba564f 100644
--- a/srcpkgs/python3-pgspecial/template
+++ b/srcpkgs/python3-pgspecial/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pgspecial'
 pkgname=python3-pgspecial
 version=1.11.9
-revision=2
-archs=noarch
+revision=3
 wrksrc="pgspecial-${version}"
 build_style=python3-module
 pycompile_module="pgspecial"

From 5490e9e2c4544de3d396426445efcf35d0378dcf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:24 -0400
Subject: [PATCH 0260/1118] python3-pgzero: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pgzero/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pgzero/template b/srcpkgs/python3-pgzero/template
index 8b8f477112d..ee3e285ca08 100644
--- a/srcpkgs/python3-pgzero/template
+++ b/srcpkgs/python3-pgzero/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pgzero'
 pkgname=python3-pgzero
 version=1.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="pgzero-${version}"
 build_style=python3-module
 pycompile_module="pgzero pgzrun.py"

From 96b4a2ebf8b03ac1376c1ede0a214bfb82779d52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:24 -0400
Subject: [PATCH 0261/1118] python3-phonenumbers: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-phonenumbers/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index dd96963adfe..98cd16d4d5e 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
 version=8.11.5
-revision=1
-archs=noarch
+revision=2
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From eb7ff709699ecc48b33adb5755290e5f68fec716 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:24 -0400
Subject: [PATCH 0262/1118] python3-pkginfo: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pkginfo/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pkginfo/template b/srcpkgs/python3-pkginfo/template
index b7cb5ec9165..cedc96de269 100644
--- a/srcpkgs/python3-pkginfo/template
+++ b/srcpkgs/python3-pkginfo/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pkginfo'
 pkgname=python3-pkginfo
 version=1.5.0.1
-revision=2
-archs=noarch
+revision=3
 wrksrc=pkginfo-${version}
 build_style=python3-module
 depends="python3"

From cb065aff9b9aedce2bfb7c7facf9f13455697e71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:24 -0400
Subject: [PATCH 0263/1118] python3-plotly: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-plotly/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template
index 9cefb0a2702..af89b9857f0 100644
--- a/srcpkgs/python3-plotly/template
+++ b/srcpkgs/python3-plotly/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-plotly'
 pkgname=python3-plotly
 version=4.9.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="plotly-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 90c174ba22f5c5228baa55b9cfe721eaba432a80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:25 -0400
Subject: [PATCH 0264/1118] python3-pmw: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pmw/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pmw/template b/srcpkgs/python3-pmw/template
index 289b5ef1d0d..9703297e18a 100644
--- a/srcpkgs/python3-pmw/template
+++ b/srcpkgs/python3-pmw/template
@@ -1,8 +1,7 @@
 # Template for python-pmw
 pkgname=python3-pmw
 version=2.0.1
-revision=2
-archs=noarch
+revision=3
 short_desc="Python 3 Tkinter widget toolkit"
 homepage="http://pmw.sourceforge.net/"
 license="MIT"

From 59f14135404ebd4018fce8a7bcdd71ac7bd5c714 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:25 -0400
Subject: [PATCH 0265/1118] python3-precis-i18n: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-precis-i18n/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-precis-i18n/template b/srcpkgs/python3-precis-i18n/template
index be7bb0b0b56..41e3d9eb67d 100644
--- a/srcpkgs/python3-precis-i18n/template
+++ b/srcpkgs/python3-precis-i18n/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-precis-i18n'
 pkgname=python3-precis-i18n
 version=1.0.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="precis_i18n-${version}"
 build_style=python3-module
 pycompile_module="precis_i18n"

From 86eaf4f89817658381c5333193b86df42cbe55e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:25 -0400
Subject: [PATCH 0266/1118] python3-priority: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-priority/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-priority/template b/srcpkgs/python3-priority/template
index 177129a7a42..425efefb2f9 100644
--- a/srcpkgs/python3-priority/template
+++ b/srcpkgs/python3-priority/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-priority'
 pkgname=python3-priority
 version=1.3.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d2fd718d61676d8549d03b678848fc1be973fac6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:25 -0400
Subject: [PATCH 0267/1118] python3-prompt_toolkit: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-prompt_toolkit/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 48193b0b08b..11fa1be366b 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
 version=3.0.7
-revision=1
-archs=noarch
+revision=2
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 534a5fe5a12de6e2d095f75e39af64bfd6f2cf85 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:25 -0400
Subject: [PATCH 0268/1118] python3-pulsectl: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pulsectl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index 5dd314d56ab..f998bf15d31 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
 version=19.10.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="pulsectl-${version}"
 build_style=python3-module
 pycompile_module="pulsectl"

From 21ada6ea261256fbfc56710960c1f85f0596062b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:25 -0400
Subject: [PATCH 0269/1118] python3-py-cpuinfo: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-py-cpuinfo/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py-cpuinfo/template b/srcpkgs/python3-py-cpuinfo/template
index c9b1a5211c1..6f5d469db55 100644
--- a/srcpkgs/python3-py-cpuinfo/template
+++ b/srcpkgs/python3-py-cpuinfo/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-py-cpuinfo'
 pkgname=python3-py-cpuinfo
 version=6.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="py-cpuinfo-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools

From 715a52f94b4b3089269d548860b05d8948944511 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:26 -0400
Subject: [PATCH 0270/1118] python3-pybind11: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pybind11/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index adbe4c10dbd..0ea664acc7b 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pybind11'
 pkgname=python3-pybind11
 version=2.5.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="pybind11-${version}"
 build_style=python3-module
 make_install_args="--install-headers=/usr/include/pybind11"

From 87d739e67f268daf5c2dc4a580411e9cc97bfc21 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:26 -0400
Subject: [PATCH 0271/1118] python3-pycollada: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pycollada/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pycollada/template b/srcpkgs/python3-pycollada/template
index 54dfc922374..bf80cd0e0d3 100644
--- a/srcpkgs/python3-pycollada/template
+++ b/srcpkgs/python3-pycollada/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pycollada'
 pkgname=python3-pycollada
 version=0.7.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="pycollada-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5f7fcb0433d492385e5cd268de2dc41f093f12ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:26 -0400
Subject: [PATCH 0272/1118] python3-pydbus: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pydbus/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pydbus/template b/srcpkgs/python3-pydbus/template
index 5ecd28aca88..73fd2ac5a2a 100644
--- a/srcpkgs/python3-pydbus/template
+++ b/srcpkgs/python3-pydbus/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pydbus'
 pkgname=python3-pydbus
 version=0.6.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="pydbus-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From da26017f791ba7a9f1fd15d056bfa15a2a08ffb1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:26 -0400
Subject: [PATCH 0273/1118] python3-pyfavicon: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pyfavicon/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyfavicon/template b/srcpkgs/python3-pyfavicon/template
index 720db698879..583027b9062 100644
--- a/srcpkgs/python3-pyfavicon/template
+++ b/srcpkgs/python3-pyfavicon/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pyfavicon'
 pkgname=python3-pyfavicon
 version=0.1.1
-revision=1
-archs=noarch
+revision=2
 wrksrc=pyfavicon-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 25dddc01a73c1b678ab04daeee6b6d6596f1b861 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:26 -0400
Subject: [PATCH 0274/1118] python3-pyfiglet: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pyfiglet/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyfiglet/template b/srcpkgs/python3-pyfiglet/template
index a4a67b12d42..6257b9274bb 100644
--- a/srcpkgs/python3-pyfiglet/template
+++ b/srcpkgs/python3-pyfiglet/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pyfiglet'
 pkgname=python3-pyfiglet
 version=0.8.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="pyfiglet-${version}"
 build_style="python3-module"
 pycompile_module="pyfiglet"

From e38253a4215f1d303707ff531c84c9b21e23e88e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:27 -0400
Subject: [PATCH 0275/1118] python3-pykeepass: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pykeepass/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index 96a53ac1ffa..2f522e03fdd 100644
--- a/srcpkgs/python3-pykeepass/template
+++ b/srcpkgs/python3-pykeepass/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pykeepass'
 pkgname=python3-pykeepass
 version=3.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a26b321c5d634e0e9fdd039d94e4901de00278fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:27 -0400
Subject: [PATCH 0276/1118] python3-pykwalify: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pykwalify/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pykwalify/template b/srcpkgs/python3-pykwalify/template
index 76398effff3..232243a560a 100644
--- a/srcpkgs/python3-pykwalify/template
+++ b/srcpkgs/python3-pykwalify/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pykwalify'
 pkgname=python3-pykwalify
 version=1.7.0
-revision=3
-archs=noarch
+revision=4
 wrksrc="pykwalify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0edb045ddcf5f66400c9fcd1f1551bca3dc9752a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:27 -0400
Subject: [PATCH 0277/1118] python3-pylibgen: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pylibgen/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pylibgen/template b/srcpkgs/python3-pylibgen/template
index 30fb465a637..4d77619ae93 100644
--- a/srcpkgs/python3-pylibgen/template
+++ b/srcpkgs/python3-pylibgen/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pylibgen'
 pkgname=python3-pylibgen
 version=2.0.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="pylibgen-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From db49479463e51bad85a170a42248db17991d3e5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:27 -0400
Subject: [PATCH 0278/1118] python3-pylru: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pylru/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pylru/template b/srcpkgs/python3-pylru/template
index 0329ab72c30..08758701c6b 100644
--- a/srcpkgs/python3-pylru/template
+++ b/srcpkgs/python3-pylru/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pylru'
 pkgname=python3-pylru
 version=1.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d828d647594fe287160753e887dd4798504ee869 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:27 -0400
Subject: [PATCH 0279/1118] python3-pypandoc: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pypandoc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template
index 928fde01371..de6fea26d07 100644
--- a/srcpkgs/python3-pypandoc/template
+++ b/srcpkgs/python3-pypandoc/template
@@ -1,9 +1,8 @@
 # Template file for 'python3-pypandoc'
 pkgname=python3-pypandoc
 version=1.5
-revision=1
+revision=2
 wrksrc=pypandoc-$version
-archs=noarch
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pandoc python3"

From 4ad2b08cbac05dd81dab63e1200e5ce733caf1d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:28 -0400
Subject: [PATCH 0280/1118] python3-pysdl2: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pysdl2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pysdl2/template b/srcpkgs/python3-pysdl2/template
index 3efdca5b667..da6af540f98 100644
--- a/srcpkgs/python3-pysdl2/template
+++ b/srcpkgs/python3-pysdl2/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pysdl2'
 pkgname=python3-pysdl2
 version=0.9.6
-revision=2
-archs=noarch
+revision=3
 wrksrc="py-sdl2-rel_${version//./_}"
 build_style=python3-module
 pycompile_module="sdl2"

From 4666893b76ffd7c94931f7de5d684c22aebb9e51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:28 -0400
Subject: [PATCH 0281/1118] python3-pyside2: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pyside2/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index ee77908b933..fe69087e4d0 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyside2'
 pkgname=python3-pyside2
 version=5.15.0
-revision=1
+revision=2
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/pyside2"
@@ -77,23 +77,19 @@ libpyside2-python3_package() {
 libpyside-python3_package() {
 	short_desc+=" - transitional dummy package"
 	build_style=meta
-	archs=noarch
 }
 
 python3-pyside_package() {
 	short_desc+=" - transitional dummy package"
 	build_style=meta
-	archs=noarch
 }
 
 python3-pyside-phonon_package() {
 	short_desc+=" - transitional dummy package"
 	build_style=meta
-	archs=noarch
 }
 
 python3-pyenet_package() {
 	short_desc+=" - transitional dummy package"
 	build_style=meta
-	archs=noarch
 }

From 1d0417996a678dd65fe851886cb092ce6e21ed3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:28 -0400
Subject: [PATCH 0282/1118] python3-pysigset: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pysigset/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pysigset/template b/srcpkgs/python3-pysigset/template
index 50d9162ea70..16b3a53e140 100644
--- a/srcpkgs/python3-pysigset/template
+++ b/srcpkgs/python3-pysigset/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pysigset'
 pkgname=python3-pysigset
 version=0.3.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="pysigset-${version}"
 build_style=python3-module
 pycompile_module="pysigset.py"

From 4fc8a65b59411ad7851b62b4e300c395a0e290ba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:28 -0400
Subject: [PATCH 0283/1118] python3-pytest-asyncio: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-pytest-asyncio/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index 0c90d33a9e5..c3f0f34009e 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pytest-asyncio'
 pkgname=python3-pytest-asyncio
 version=0.10.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="pytest-asyncio-${version}"
 build_style=python3-module
 pycompile_module="pytest_asyncio"

From 85796a10b03341fe29852f7b992548cf54cbfc4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:28 -0400
Subject: [PATCH 0284/1118] python3-pytest-qt: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pytest-qt/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
index a15bc15a4f3..ab870da8e06 100644
--- a/srcpkgs/python3-pytest-qt/template
+++ b/srcpkgs/python3-pytest-qt/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pytest-qt'
 pkgname=python3-pytest-qt
 version=3.3.0
-revision=1
-archs=noarch
+revision=2
 wrksrc=pytest-qt-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 39b4afaa50de92e5bbafd67033959ffd0b930d83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:28 -0400
Subject: [PATCH 0285/1118] python3-pytest-xvfb: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pytest-xvfb/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytest-xvfb/template b/srcpkgs/python3-pytest-xvfb/template
index 9e3aa7822d4..0e002f07ace 100644
--- a/srcpkgs/python3-pytest-xvfb/template
+++ b/srcpkgs/python3-pytest-xvfb/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pytest-xvfb'
 pkgname=python3-pytest-xvfb
 version=2.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc=pytest-xvfb-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f4873f1c268e5002bf56819f326c763a887fd23c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:29 -0400
Subject: [PATCH 0286/1118] python3-pythondialog: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pythondialog/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pythondialog/template b/srcpkgs/python3-pythondialog/template
index b55866f51e6..0edc20a6953 100644
--- a/srcpkgs/python3-pythondialog/template
+++ b/srcpkgs/python3-pythondialog/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pythondialog'
 pkgname=python3-pythondialog
 version=3.5.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="pythondialog-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9ffcf8914380edb57bc1880b5b46aa38c70c15ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:29 -0400
Subject: [PATCH 0287/1118] python3-pytools: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pytools/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 446df179c07..d65496c03f4 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
 version=2020.4
-revision=1
-archs=noarch
+revision=2
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1d4237fee182dbde038a186fa95fba529427885d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:29 -0400
Subject: [PATCH 0288/1118] python3-pywinrm: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-pywinrm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pywinrm/template b/srcpkgs/python3-pywinrm/template
index 7a57b8efcb3..49d7de623a9 100644
--- a/srcpkgs/python3-pywinrm/template
+++ b/srcpkgs/python3-pywinrm/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pywinrm'
 pkgname=python3-pywinrm
 version=0.4.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="pywinrm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 81df040bc31e54ab7a6b9788777e7de135f635c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:29 -0400
Subject: [PATCH 0289/1118] python3-pyx: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-pyx/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyx/template b/srcpkgs/python3-pyx/template
index f8de127e420..c39d94f7c3c 100644
--- a/srcpkgs/python3-pyx/template
+++ b/srcpkgs/python3-pyx/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-pyx'
 pkgname=python3-pyx
 version=0.15
-revision=1
-archs=noarch
+revision=2
 wrksrc="PyX-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6bc978a9bcee4d7ce1f441dd45db9c41d093ee78 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:29 -0400
Subject: [PATCH 0290/1118] python3-readlike: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-readlike/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-readlike/template b/srcpkgs/python3-readlike/template
index 43159962442..a9057e180c3 100644
--- a/srcpkgs/python3-readlike/template
+++ b/srcpkgs/python3-readlike/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-readlike'
 pkgname=python3-readlike
 version=0.1.3
-revision=2
-archs=noarch
+revision=3
 wrksrc=readlike-${version}
 build_style=python3-module
 pycompile_module="readlike.py"

From 10594b2006f867976765fbeaf7803dfab24e78c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:30 -0400
Subject: [PATCH 0291/1118] python3-repoze.sphinx.autointerface: rebuild for
 Python 3.9, drop noarch

---
 srcpkgs/python3-repoze.sphinx.autointerface/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-repoze.sphinx.autointerface/template b/srcpkgs/python3-repoze.sphinx.autointerface/template
index 684c7f90d05..18141a5bd46 100644
--- a/srcpkgs/python3-repoze.sphinx.autointerface/template
+++ b/srcpkgs/python3-repoze.sphinx.autointerface/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-repoze.sphinx.autointerface'
 pkgname=python3-repoze.sphinx.autointerface
 version=0.8
-revision=3
-archs=noarch
+revision=4
 wrksrc="repoze.sphinx.autointerface-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9560dacfb377fcc4cb826f48d8f64ab26efd679b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:30 -0400
Subject: [PATCH 0292/1118] python3-requests-file: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-requests-file/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-requests-file/template b/srcpkgs/python3-requests-file/template
index 1f459fa55ab..8d9626dc7e4 100644
--- a/srcpkgs/python3-requests-file/template
+++ b/srcpkgs/python3-requests-file/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-requests-file'
 pkgname=python3-requests-file
 version=1.4.3
-revision=1
-archs=noarch
+revision=2
 wrksrc="requests-file-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 444078af652677cd79066949ea9ff4a70e0c292e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:30 -0400
Subject: [PATCH 0293/1118] python3-requests-ntlm: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-requests-ntlm/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-requests-ntlm/template b/srcpkgs/python3-requests-ntlm/template
index 7ca189d6abf..fc5c0dc6aab 100644
--- a/srcpkgs/python3-requests-ntlm/template
+++ b/srcpkgs/python3-requests-ntlm/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-requests-ntlm'
 pkgname=python3-requests-ntlm
 version=1.1.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="requests-ntlm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 65eb01da35ca5e5aa23699b0c1b9518659e605c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:30 -0400
Subject: [PATCH 0294/1118] python3-requests-unixsocket: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-requests-unixsocket/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-requests-unixsocket/template b/srcpkgs/python3-requests-unixsocket/template
index fd389ec2d13..34c34c09046 100644
--- a/srcpkgs/python3-requests-unixsocket/template
+++ b/srcpkgs/python3-requests-unixsocket/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-requests-unixsocket'
 pkgname=python3-requests-unixsocket
 version=0.2.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="requests-unixsocket-${version}"
 build_style=python3-module
 pycompile_module="requests_unixsocket"

From 4b30605768c9ecc7948c63ea82f7c9a327ad9c50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:30 -0400
Subject: [PATCH 0295/1118] python3-rss2email: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-rss2email/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rss2email/template b/srcpkgs/python3-rss2email/template
index 69e67d93deb..9a7b414c7ab 100644
--- a/srcpkgs/python3-rss2email/template
+++ b/srcpkgs/python3-rss2email/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-rss2email'
 pkgname=python3-rss2email
 version=3.11
-revision=2
-archs=noarch
+revision=3
 wrksrc="rss2email-${version}"
 build_style=python3-module
 pycompile_module="rss2email"

From 7b7f0db31c29592a827253d873980e185c39ecd9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:30 -0400
Subject: [PATCH 0296/1118] python3-rtree: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-rtree/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template
index 652b840591e..0500d93e33e 100644
--- a/srcpkgs/python3-rtree/template
+++ b/srcpkgs/python3-rtree/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-rtree'
 pkgname=python3-rtree
 version=0.9.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="rtree-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools libspatialindex-devel"

From 832b4e8a265509c8200c53f94be274e22750ae4a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:31 -0400
Subject: [PATCH 0297/1118] python3-s-tui: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-s-tui/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-s-tui/template b/srcpkgs/python3-s-tui/template
index 5864e90c91a..3c7fec4c6e8 100644
--- a/srcpkgs/python3-s-tui/template
+++ b/srcpkgs/python3-s-tui/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-s-tui'
 pkgname=python3-s-tui
 version=1.0.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="s-tui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 455ed466faa4b8aa426ba8d7e9674ca5e5c024f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:31 -0400
Subject: [PATCH 0298/1118] python3-saml2: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-saml2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index a8d2798b61c..5506ce0828f 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
 version=5.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="pysaml2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5576559ffd5fe946f3663a12a2fcd5aebe56e41b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:31 -0400
Subject: [PATCH 0299/1118] python3-scruffy: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-scruffy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-scruffy/template b/srcpkgs/python3-scruffy/template
index 62a21a74eca..32a41d71ab5 100644
--- a/srcpkgs/python3-scruffy/template
+++ b/srcpkgs/python3-scruffy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-scruffy'
 pkgname=python3-scruffy
 version=0.3.8.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="scruffy-${version}"
 build_style=python3-module
 pycompile_module="scruffy"

From 3b02f6c968584c0b2b2c227f80e1e1acc1e0a7ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:31 -0400
Subject: [PATCH 0300/1118] python3-semanticversion: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-semanticversion/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-semanticversion/template b/srcpkgs/python3-semanticversion/template
index 766eeb160f8..19db48a5a74 100644
--- a/srcpkgs/python3-semanticversion/template
+++ b/srcpkgs/python3-semanticversion/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-semanticversion'
 pkgname=python3-semanticversion
 version=2.8.5
-revision=1
-archs=noarch
+revision=2
 wrksrc="semantic_version-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 18c584895f099badd0f80545d38568e99919cbc3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:31 -0400
Subject: [PATCH 0301/1118] python3-sentry: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-sentry/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template
index c340cbb7820..c4406811688 100644
--- a/srcpkgs/python3-sentry/template
+++ b/srcpkgs/python3-sentry/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sentry'
 pkgname=python3-sentry
 version=0.15.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="sentry-python-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools

From 01f87e724d5cb6a2e431d74a6c0e436dd1b61837 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:32 -0400
Subject: [PATCH 0302/1118] python3-serpent: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-serpent/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-serpent/template b/srcpkgs/python3-serpent/template
index 538bfcd1786..4b950974494 100644
--- a/srcpkgs/python3-serpent/template
+++ b/srcpkgs/python3-serpent/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-serpent'
 pkgname=python3-serpent
 version=1.30.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 54fc0062240b292543505dd5042228e0ef350b74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:32 -0400
Subject: [PATCH 0303/1118] python3-shodan: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-shodan/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-shodan/template b/srcpkgs/python3-shodan/template
index 390f9d79322..d4d403681be 100644
--- a/srcpkgs/python3-shodan/template
+++ b/srcpkgs/python3-shodan/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-shodan'
 pkgname=python3-shodan
 version=1.23.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="shodan-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5951c49eea685ce71b431703df4406149ca6be12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:32 -0400
Subject: [PATCH 0304/1118] python3-signedjson: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-signedjson/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 5002ade8f79..9edb9c24b14 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-signedjson'
 pkgname=python3-signedjson
 version=1.1.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="python-signedjson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a6d2df2e180bfdcc8a79b2d4394b9c9cb3e37fe9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:32 -0400
Subject: [PATCH 0305/1118] python3-slugify: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-slugify/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-slugify/template b/srcpkgs/python3-slugify/template
index 012bb98f063..31e2eff0715 100644
--- a/srcpkgs/python3-slugify/template
+++ b/srcpkgs/python3-slugify/template
@@ -3,8 +3,7 @@ pkgname=python3-slugify
 # Please don't update. Only required by Transifx-client,
 # doesn't work with newer versions
 version=1.2.6
-revision=2
-archs=noarch
+revision=3
 wrksrc="python-slugify-${version}"
 build_style=python3-module
 pycompile_module="slugify"

From 65f77a5227afc349b6c98e65a6316f8cc5b1041c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:32 -0400
Subject: [PATCH 0306/1118] python3-sortedcontainers: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-sortedcontainers/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sortedcontainers/template b/srcpkgs/python3-sortedcontainers/template
index 41d87d4ebd0..5d768b0e4f0 100644
--- a/srcpkgs/python3-sortedcontainers/template
+++ b/srcpkgs/python3-sortedcontainers/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sortedcontainers'
 pkgname=python3-sortedcontainers
 version=2.1.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="sortedcontainers-${version}"
 build_style=python3-module
 pycompile_module="sortedcontainers"

From b49f4ee479c9aebfb62dd9d1a5b7e9dfff325ca0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:32 -0400
Subject: [PATCH 0307/1118] python3-spake2: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-spake2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-spake2/template b/srcpkgs/python3-spake2/template
index dc0cdced747..df74c2cdc78 100644
--- a/srcpkgs/python3-spake2/template
+++ b/srcpkgs/python3-spake2/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-spake2'
 pkgname=python3-spake2
 version=0.8
-revision=2
-archs=noarch
+revision=3
 wrksrc="python-spake2-${version}"
 build_style=python3-module
 pycompile_module="spake2"

From dd169f9457b91b50709ee72161e3569813d093bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:33 -0400
Subject: [PATCH 0308/1118] python3-sphinx_rtd_theme: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-sphinx_rtd_theme/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinx_rtd_theme/template b/srcpkgs/python3-sphinx_rtd_theme/template
index 8447a451a74..3884255d019 100644
--- a/srcpkgs/python3-sphinx_rtd_theme/template
+++ b/srcpkgs/python3-sphinx_rtd_theme/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinx_rtd_theme'
 pkgname=python3-sphinx_rtd_theme
 version=0.5.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="sphinx_rtd_theme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From db27bd1811e31aca0b46f6d48cb67c7881fa64d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:33 -0400
Subject: [PATCH 0309/1118] python3-sphinxcontrib: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-sphinxcontrib/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinxcontrib/template b/srcpkgs/python3-sphinxcontrib/template
index d52fd02ab76..37f57813e21 100644
--- a/srcpkgs/python3-sphinxcontrib/template
+++ b/srcpkgs/python3-sphinxcontrib/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinxcontrib'
 pkgname=python3-sphinxcontrib
 version=1.0
-revision=4
-archs=noarch
+revision=5
 create_wrksrc=yes
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"

From 2717fc209299859adbdc352a196f52f78d4c3476 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:33 -0400
Subject: [PATCH 0310/1118] python3-sphinxcontrib-applehelp: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-sphinxcontrib-applehelp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinxcontrib-applehelp/template b/srcpkgs/python3-sphinxcontrib-applehelp/template
index 90bfc78adf8..0762615c0e5 100644
--- a/srcpkgs/python3-sphinxcontrib-applehelp/template
+++ b/srcpkgs/python3-sphinxcontrib-applehelp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinxcontrib-applehelp'
 pkgname=python3-sphinxcontrib-applehelp
 version=1.0.2
-revision=1
-archs=noarch
+revision=2
 wrksrc=sphinxcontrib-applehelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c05bcd8503a282abe017d74828fbd7ce2f9b2ce5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:33 -0400
Subject: [PATCH 0311/1118] python3-sphinxcontrib-devhelp: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-sphinxcontrib-devhelp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinxcontrib-devhelp/template b/srcpkgs/python3-sphinxcontrib-devhelp/template
index 0244d826d17..0504c762588 100644
--- a/srcpkgs/python3-sphinxcontrib-devhelp/template
+++ b/srcpkgs/python3-sphinxcontrib-devhelp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinxcontrib-devhelp'
 pkgname=python3-sphinxcontrib-devhelp
 version=1.0.2
-revision=1
-archs=noarch
+revision=2
 wrksrc=sphinxcontrib-devhelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 30fd0ce001df7b5683ad94b85ae3b73d90f0d4cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:33 -0400
Subject: [PATCH 0312/1118] python3-sphinxcontrib-htmlhelp: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-sphinxcontrib-htmlhelp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinxcontrib-htmlhelp/template b/srcpkgs/python3-sphinxcontrib-htmlhelp/template
index 33dac6dbfad..54f54adabd6 100644
--- a/srcpkgs/python3-sphinxcontrib-htmlhelp/template
+++ b/srcpkgs/python3-sphinxcontrib-htmlhelp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinxcontrib-htmlhelp'
 pkgname=python3-sphinxcontrib-htmlhelp
 version=1.0.3
-revision=1
-archs=noarch
+revision=2
 wrksrc=sphinxcontrib-htmlhelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1dab464106c7d8929ff79b9f60729041c277ba18 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:34 -0400
Subject: [PATCH 0313/1118] python3-sphinxcontrib-jsmath: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-sphinxcontrib-jsmath/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinxcontrib-jsmath/template b/srcpkgs/python3-sphinxcontrib-jsmath/template
index 266ff00b88b..9234fc58cd7 100644
--- a/srcpkgs/python3-sphinxcontrib-jsmath/template
+++ b/srcpkgs/python3-sphinxcontrib-jsmath/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinxcontrib-jsmath'
 pkgname=python3-sphinxcontrib-jsmath
 version=1.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc=sphinxcontrib-jsmath-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f6e86536f68b9867dfe2735850c8d1abcfed9bc4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:34 -0400
Subject: [PATCH 0314/1118] python3-sphinxcontrib-qthelp: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-sphinxcontrib-qthelp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinxcontrib-qthelp/template b/srcpkgs/python3-sphinxcontrib-qthelp/template
index 2335cb13cb8..2f6e47965db 100644
--- a/srcpkgs/python3-sphinxcontrib-qthelp/template
+++ b/srcpkgs/python3-sphinxcontrib-qthelp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinxcontrib-qthelp'
 pkgname=python3-sphinxcontrib-qthelp
 version=1.0.3
-revision=1
-archs=noarch
+revision=2
 wrksrc=sphinxcontrib-qthelp-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7c9f46472c1d5e357a5607b6a0de53cd15a21dbe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:34 -0400
Subject: [PATCH 0315/1118] python3-sphinxcontrib-serializinghtml: rebuild for
 Python 3.9, drop noarch

---
 srcpkgs/python3-sphinxcontrib-serializinghtml/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sphinxcontrib-serializinghtml/template b/srcpkgs/python3-sphinxcontrib-serializinghtml/template
index 82ddabe65ed..cd6a451bcf2 100644
--- a/srcpkgs/python3-sphinxcontrib-serializinghtml/template
+++ b/srcpkgs/python3-sphinxcontrib-serializinghtml/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sphinxcontrib-serializinghtml'
 pkgname=python3-sphinxcontrib-serializinghtml
 version=1.1.4
-revision=1
-archs=noarch
+revision=2
 wrksrc=sphinxcontrib-serializinghtml-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 09225debf6ed1839a1b1c00ceb1487ef1105971a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:34 -0400
Subject: [PATCH 0316/1118] python3-stevedore: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-stevedore/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-stevedore/template b/srcpkgs/python3-stevedore/template
index 2b23d77c09b..9964fe3dd94 100644
--- a/srcpkgs/python3-stevedore/template
+++ b/srcpkgs/python3-stevedore/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-stevedore'
 pkgname=python3-stevedore
 version=3.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="stevedore-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"

From f8caba48a0593896d2b69b232d9b90e94a595027 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:34 -0400
Subject: [PATCH 0317/1118] python3-subunit: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-subunit/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-subunit/template b/srcpkgs/python3-subunit/template
index a617b3db63a..e16ef316a7e 100644
--- a/srcpkgs/python3-subunit/template
+++ b/srcpkgs/python3-subunit/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-subunit'
 pkgname=python3-subunit
 version=1.4.0
-revision=1
-archs=noarch
+revision=2
 wrksrc=subunit-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3df56dabbdde62119998b0cec2733be2ec6864d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:34 -0400
Subject: [PATCH 0318/1118] python3-svg.path: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-svg.path/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 473fc38dcc4..8b94cf795b4 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
 version=4.0.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="svg.path-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1b4a7d36c7041ad55354c3a6777358f1d52045f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:35 -0400
Subject: [PATCH 0319/1118] python3-sympy: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-sympy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index 77f7747a999..2a2ebd52f5f 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
 version=1.6.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="sympy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f4cd20b7d25af2942021b2d6b664aba867e90a20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:35 -0400
Subject: [PATCH 0320/1118] python3-tabulate: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-tabulate/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template
index 16956529913..a37e6a3de90 100644
--- a/srcpkgs/python3-tabulate/template
+++ b/srcpkgs/python3-tabulate/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-tabulate'
 pkgname=python3-tabulate
 version=0.8.6
-revision=1
-archs=noarch
+revision=2
 wrksrc="tabulate-${version}"
 build_style=python3-module
 pycompile_module="tabulate.py"

From ddeeea3a5eefeec6662a7b172d7683dd34fedafe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:35 -0400
Subject: [PATCH 0321/1118] python3-terminaltables: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-terminaltables/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-terminaltables/template b/srcpkgs/python3-terminaltables/template
index 4f781eab76d..615c5522c44 100644
--- a/srcpkgs/python3-terminaltables/template
+++ b/srcpkgs/python3-terminaltables/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-terminaltables'
 pkgname=python3-terminaltables
 version=3.1.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="terminaltables-${version}"
 build_style=python3-module
 pycompile_module="terminaltables"

From 89005f5ce69f402de509d837cdbb6806972d5eb0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:35 -0400
Subject: [PATCH 0322/1118] python3-text-unidecode: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-text-unidecode/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-text-unidecode/template b/srcpkgs/python3-text-unidecode/template
index b3b5aa95575..cce8aacaf9a 100644
--- a/srcpkgs/python3-text-unidecode/template
+++ b/srcpkgs/python3-text-unidecode/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-text-unidecode'
 pkgname=python3-text-unidecode
 version=1.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="text-unidecode-${version}"
 build_style=python3-module
 pycompile_module="text_unidecode"

From 584de96454a2046abdd71aaaec2203b863aeaa1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:35 -0400
Subject: [PATCH 0323/1118] python3-tinycss: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-tinycss/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tinycss/template b/srcpkgs/python3-tinycss/template
index 3b4717c234e..39cda657470 100644
--- a/srcpkgs/python3-tinycss/template
+++ b/srcpkgs/python3-tinycss/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-tinycss'
 pkgname=python3-tinycss
 version=0.4
-revision=2
-archs=noarch
+revision=3
 wrksrc=tinycss-${version}
 build_style=python3-module
 pycompile_module="tinycss"

From fca236cab5d5ea05c8ad19514d5e4bd55b043241 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:35 -0400
Subject: [PATCH 0324/1118] python3-tldextract: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-tldextract/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tldextract/template b/srcpkgs/python3-tldextract/template
index 2a9392a5dcc..3c769d6233e 100644
--- a/srcpkgs/python3-tldextract/template
+++ b/srcpkgs/python3-tldextract/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-tldextract'
 pkgname=python3-tldextract
 version=2.2.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="tldextract-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4e45faad39b30e60a4e37d8fb8784c8c71b53ed4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:36 -0400
Subject: [PATCH 0325/1118] python3-transifex-client: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-transifex-client/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-transifex-client/template b/srcpkgs/python3-transifex-client/template
index 5ea767b5a7d..e34c310c0a8 100644
--- a/srcpkgs/python3-transifex-client/template
+++ b/srcpkgs/python3-transifex-client/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-transifex-client'
 pkgname=python3-transifex-client
 version=0.13.6
-revision=2
-archs=noarch
+revision=3
 wrksrc="transifex-client-${version}"
 build_style=python3-module
 pycompile_module="txclib"

From ff0843038cc98b7c2c2c544eee1c6f2972f95dc0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:36 -0400
Subject: [PATCH 0326/1118] python3-treq: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-treq/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index 075f90e49ef..21a11977189 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-treq'
 pkgname=python3-treq
 version=20.3.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="treq-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d2815552f58bd10e4bde5deb0681a25ea8e0ac0e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:36 -0400
Subject: [PATCH 0327/1118] python3-txacme: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-txacme/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-txacme/template b/srcpkgs/python3-txacme/template
index bd1c82d0611..3e33991a003 100644
--- a/srcpkgs/python3-txacme/template
+++ b/srcpkgs/python3-txacme/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-txacme'
 pkgname=python3-txacme
 version=0.9.3
-revision=1
-archs=noarch
+revision=2
 wrksrc="txacme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4826a1552d6e43ebf08077b70e434c943327d4f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:36 -0400
Subject: [PATCH 0328/1118] python3-txaio: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-txaio/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template
index d9ee273d235..47dadfa68ed 100644
--- a/srcpkgs/python3-txaio/template
+++ b/srcpkgs/python3-txaio/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-txaio'
 pkgname=python3-txaio
 version=20.4.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="txaio-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From b047dd77e86255e4d03450c7113a3661ff242b2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:36 -0400
Subject: [PATCH 0329/1118] python3-txtorcon: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-txtorcon/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
index d2ad88b06d1..5a0683f1760 100644
--- a/srcpkgs/python3-txtorcon/template
+++ b/srcpkgs/python3-txtorcon/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-txtorcon'
 pkgname=python3-txtorcon
 version=20.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="txtorcon-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"

From bf801d7f57f8bea4ca9f3710826bb09fd5c48135 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:37 -0400
Subject: [PATCH 0330/1118] python3-typing_extensions: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-typing_extensions/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template
index 57405689d4e..93c5d70f1c6 100644
--- a/srcpkgs/python3-typing_extensions/template
+++ b/srcpkgs/python3-typing_extensions/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-typing_extensions'
 pkgname=python3-typing_extensions
 version=3.7.4.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0fdcc6dd453ef168314795b4a84276ba85b7ea44 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:37 -0400
Subject: [PATCH 0331/1118] python3-tzlocal: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-tzlocal/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tzlocal/template b/srcpkgs/python3-tzlocal/template
index 7ea15464075..73114a2aadc 100644
--- a/srcpkgs/python3-tzlocal/template
+++ b/srcpkgs/python3-tzlocal/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-tzlocal'
 pkgname=python3-tzlocal
 version=2.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="tzlocal-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b716cb8b0cf41db3fb5d177c1cf317a04f91300d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:37 -0400
Subject: [PATCH 0332/1118] python3-unpaddedbase64: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-unpaddedbase64/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-unpaddedbase64/template b/srcpkgs/python3-unpaddedbase64/template
index 06a47db3b64..4b2bdc9b77c 100644
--- a/srcpkgs/python3-unpaddedbase64/template
+++ b/srcpkgs/python3-unpaddedbase64/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-unpaddedbase64'
 pkgname=python3-unpaddedbase64
 version=1.1.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="python-unpaddedbase64-${version}"
 build_style=python3-module
 pycompile_module="unpaddedbase64.py"

From 89befe56c459c8034e8e69ab13259c9530ecb800 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:37 -0400
Subject: [PATCH 0333/1118] python3-urlgrabber: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-urlgrabber/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-urlgrabber/template b/srcpkgs/python3-urlgrabber/template
index eef67c8e13c..3eacefc9d09 100644
--- a/srcpkgs/python3-urlgrabber/template
+++ b/srcpkgs/python3-urlgrabber/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-urlgrabber'
 pkgname=python3-urlgrabber
 version=4.0.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="urlgrabber-${version}"
 build_style=python3-module
 pycompile_module="urlgrabber"

From 752a4e4bb8e653d55c87519e4593671fc9985b06 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:37 -0400
Subject: [PATCH 0334/1118] python3-userpath: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-userpath/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index 4d53e7b5dea..67e62bb719f 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-userpath'
 pkgname=python3-userpath
 version=1.4.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="userpath-${version}"
 build_style=python3-module
 pycompile_module="userpath"

From 7b6fdce1189dc8ca61aebcd745d3597bfcedbe65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:37 -0400
Subject: [PATCH 0335/1118] python3-validators: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-validators/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-validators/template b/srcpkgs/python3-validators/template
index 2d790254c96..ab604468662 100644
--- a/srcpkgs/python3-validators/template
+++ b/srcpkgs/python3-validators/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-validators'
 pkgname=python3-validators
 version=0.14.2
-revision=1
-archs=noarch
+revision=2
 wrksrc="validators-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 88534fc3ff828db0fa7e4ee7f76e8f7f1660922b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:38 -0400
Subject: [PATCH 0336/1118] python3-virtualenv: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-virtualenv/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 7f9f71fccc5..d12c705ad59 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
 version=20.0.20
-revision=2
-archs=noarch
+revision=3
 wrksrc="virtualenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 26f426623912e9b3222162bd66c6b05fbc59cfb0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:38 -0400
Subject: [PATCH 0337/1118] python3-virtualenv-clone: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-virtualenv-clone/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-virtualenv-clone/template b/srcpkgs/python3-virtualenv-clone/template
index 508e855b9cd..55bdbd282f1 100644
--- a/srcpkgs/python3-virtualenv-clone/template
+++ b/srcpkgs/python3-virtualenv-clone/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-virtualenv-clone'
 pkgname=python3-virtualenv-clone
 version=0.5.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9b37958e53f14255e4ddf6d1a728840817f1dcb3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:38 -0400
Subject: [PATCH 0338/1118] python3-virustotal-api: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-virustotal-api/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-virustotal-api/template b/srcpkgs/python3-virustotal-api/template
index fc362c03b39..b3551336f58 100644
--- a/srcpkgs/python3-virustotal-api/template
+++ b/srcpkgs/python3-virustotal-api/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-virustotal-api'
 pkgname=python3-virustotal-api
 version=1.1.11
-revision=2
-archs=noarch
+revision=3
 wrksrc="virustotal-api-${version}"
 build_style=python3-module
 pycompile_module="virus_total_apis"

From d32cf4774fa25ad7b93a6de7698291353b58755e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:38 -0400
Subject: [PATCH 0339/1118] python3-xapp: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-xapp/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-xapp/template b/srcpkgs/python3-xapp/template
index 6e746704ad8..ac7117ecd14 100644
--- a/srcpkgs/python3-xapp/template
+++ b/srcpkgs/python3-xapp/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-xapp'
 pkgname=python3-xapp
 version=2.0.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="xapp"
 hostmakedepends="python3-setuptools"

From ab2b3399f976f06c127ce4d72e66061d8875f8bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:38 -0400
Subject: [PATCH 0340/1118] python3-xdg-variables: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-xdg-variables/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-xdg-variables/template b/srcpkgs/python3-xdg-variables/template
index 589302d33bc..37e9689bf1a 100644
--- a/srcpkgs/python3-xdg-variables/template
+++ b/srcpkgs/python3-xdg-variables/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-xdg-variables'
 pkgname=python3-xdg-variables
 version=4.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="xdg-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e3df026c4b2674c29f4a1b6d80820ab02531bc5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:39 -0400
Subject: [PATCH 0341/1118] python3-xlrd: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-xlrd/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-xlrd/template b/srcpkgs/python3-xlrd/template
index 9f7b29580e4..8d6859e4dfd 100644
--- a/srcpkgs/python3-xlrd/template
+++ b/srcpkgs/python3-xlrd/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-xlrd'
 pkgname=python3-xlrd
 version=1.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fbd557be19cb327909dae431ccef303174042976 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:39 -0400
Subject: [PATCH 0342/1118] python3-yapf: rebuild for Python 3.9, drop noarch

---
 srcpkgs/python3-yapf/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-yapf/template b/srcpkgs/python3-yapf/template
index 33111cd732d..1fda3e07b9a 100644
--- a/srcpkgs/python3-yapf/template
+++ b/srcpkgs/python3-yapf/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-yapf'
 pkgname=python3-yapf
 version=0.29.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="yapf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 38ae68805d69c390870a5e97540d1d0d37a9537c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:39 -0400
Subject: [PATCH 0343/1118] python3-youtube-search: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-youtube-search/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtube-search/template b/srcpkgs/python3-youtube-search/template
index 0c6ec393a37..a65a86470c4 100644
--- a/srcpkgs/python3-youtube-search/template
+++ b/srcpkgs/python3-youtube-search/template
@@ -1,9 +1,8 @@
 # Template file for 'python3-youtube-search'
 pkgname=python3-youtube-search
 version=1.1.0
-revision=1
+revision=2
 _gitver=86af3e73bd340f37be56f2be6a5ff706b16e454e
-archs=noarch
 create_wrksrc=yes
 build_wrksrc="youtube-search-${version}"
 build_style=python3-module

From 2c85ba665aecfcc41d31cce0bf8e6dc4b9d1a964 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:39 -0400
Subject: [PATCH 0344/1118] python3-yoyo-migrations: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-yoyo-migrations/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-yoyo-migrations/template b/srcpkgs/python3-yoyo-migrations/template
index 9e481e153f4..1eb088d9928 100644
--- a/srcpkgs/python3-yoyo-migrations/template
+++ b/srcpkgs/python3-yoyo-migrations/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-yoyo-migrations'
 pkgname=python3-yoyo-migrations
 version=7.2.0
-revision=1
-archs=noarch
+revision=2
 wrksrc=yoyo-migrations-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 76606758400961c2d51d80155dc495bea7724074 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:39 -0400
Subject: [PATCH 0345/1118] python3-zope.cachedescriptors: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-zope.cachedescriptors/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.cachedescriptors/template b/srcpkgs/python3-zope.cachedescriptors/template
index 1f1fae5b27b..abf2630b094 100644
--- a/srcpkgs/python3-zope.cachedescriptors/template
+++ b/srcpkgs/python3-zope.cachedescriptors/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.cachedescriptors'
 pkgname=python3-zope.cachedescriptors
 version=4.3.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="zope.cachedescriptors-${version}"
 build_style=python3-module
 pycompile_module="zope/cachedescriptors"

From 1ac78b2557b723ba5f9bb61ac524b215533478e5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:40 -0400
Subject: [PATCH 0346/1118] python3-zope.configuration: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-zope.configuration/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.configuration/template b/srcpkgs/python3-zope.configuration/template
index a18339a5d7a..35685dd79dc 100644
--- a/srcpkgs/python3-zope.configuration/template
+++ b/srcpkgs/python3-zope.configuration/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.configuration'
 pkgname=python3-zope.configuration
 version=4.4.0
-revision=1
-archs=noarch
+revision=2
 wrksrc="zope.configuration-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From ee20f5a8e73d378a21a91fee94525356e5d6ad68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:40 -0400
Subject: [PATCH 0347/1118] python3-zope.copy: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-zope.copy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.copy/template b/srcpkgs/python3-zope.copy/template
index 7007acb96b4..cc22130112a 100644
--- a/srcpkgs/python3-zope.copy/template
+++ b/srcpkgs/python3-zope.copy/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.copy'
 pkgname=python3-zope.copy
 version=4.2
-revision=2
-archs=noarch
+revision=3
 wrksrc="zope.copy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2d2fecaec1b2e9fb6b8adef0df84572ed4f909ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:40 -0400
Subject: [PATCH 0348/1118] python3-zope.deferredimport: rebuild for Python
 3.9, drop noarch

---
 srcpkgs/python3-zope.deferredimport/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.deferredimport/template b/srcpkgs/python3-zope.deferredimport/template
index 7e8ff8fca5c..81f6fbb9de7 100644
--- a/srcpkgs/python3-zope.deferredimport/template
+++ b/srcpkgs/python3-zope.deferredimport/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.deferredimport'
 pkgname=python3-zope.deferredimport
 version=4.3.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="zope.deferredimport-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fd6c8ddb66e45802cdde92931096e3f1235b0d4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:40 -0400
Subject: [PATCH 0349/1118] python3-zope.deprecation: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-zope.deprecation/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.deprecation/template b/srcpkgs/python3-zope.deprecation/template
index 854c67dfa8a..44a2ce86560 100644
--- a/srcpkgs/python3-zope.deprecation/template
+++ b/srcpkgs/python3-zope.deprecation/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.deprecation'
 pkgname=python3-zope.deprecation
 version=4.4.0
-revision=3
-archs=noarch
+revision=4
 wrksrc="zope.deprecation-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 13272b8fa5e2b971564f19f76c39ec1ec71a274b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:40 -0400
Subject: [PATCH 0350/1118] python3-zope.event: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-zope.event/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.event/template b/srcpkgs/python3-zope.event/template
index 0ca1af6cfc4..7de9713fc22 100644
--- a/srcpkgs/python3-zope.event/template
+++ b/srcpkgs/python3-zope.event/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.event'
 pkgname=python3-zope.event
 version=4.4
-revision=3
-archs=noarch
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 pycompile_module="zope/event"

From 75e7b647dd9e584ba3d4401388bd54afc1b93ac2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:40 -0400
Subject: [PATCH 0351/1118] python3-zope.hookable: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-zope.hookable/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.hookable/template b/srcpkgs/python3-zope.hookable/template
index 774cf286c8e..62ecbac6425 100644
--- a/srcpkgs/python3-zope.hookable/template
+++ b/srcpkgs/python3-zope.hookable/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.hookable'
 pkgname=python3-zope.hookable
 version=5.0.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="zope.hookable-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 75c268dab438e5b8da5685a5f07094cdff58ba49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:41 -0400
Subject: [PATCH 0352/1118] python3-zope.location: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-zope.location/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.location/template b/srcpkgs/python3-zope.location/template
index c2d6435dcf4..f45b5272d18 100644
--- a/srcpkgs/python3-zope.location/template
+++ b/srcpkgs/python3-zope.location/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.location'
 pkgname=python3-zope.location
 version=4.2
-revision=3
-archs=noarch
+revision=4
 wrksrc="zope.location-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-repoze.sphinx.autointerface

From 7afe9f3697ee2022d9d2b124a658532517782aca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:41 -0400
Subject: [PATCH 0353/1118] python3-zope.schema: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-zope.schema/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.schema/template b/srcpkgs/python3-zope.schema/template
index 7c45510564d..03ffba962e2 100644
--- a/srcpkgs/python3-zope.schema/template
+++ b/srcpkgs/python3-zope.schema/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.schema'
 pkgname=python3-zope.schema
 version=6.0.0
-revision=1
-archs=noarch
+revision=2
 wrksrc=zope.schema-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 38318849ba1161a8167b4189f004c3e5017df8a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:41 -0400
Subject: [PATCH 0354/1118] python3-zope.testing: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/python3-zope.testing/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.testing/template b/srcpkgs/python3-zope.testing/template
index 9fd4dd19dcd..48373ebb563 100644
--- a/srcpkgs/python3-zope.testing/template
+++ b/srcpkgs/python3-zope.testing/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.testing'
 pkgname=python3-zope.testing
 version=4.7
-revision=2
-archs=noarch
+revision=3
 wrksrc="zope.testing-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 96b5c07c3826302412746376b9efe0ce53b5f9ec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:41 -0400
Subject: [PATCH 0355/1118] python3-zope.testrunner: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/python3-zope.testrunner/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zope.testrunner/template b/srcpkgs/python3-zope.testrunner/template
index 85413372686..1575621fdd0 100644
--- a/srcpkgs/python3-zope.testrunner/template
+++ b/srcpkgs/python3-zope.testrunner/template
@@ -1,8 +1,7 @@
 # Template file for 'python3-zope.testrunner'
 pkgname=python3-zope.testrunner
 version=5.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="zope.testrunner-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib"

From cdfd94bc864a73f8733c30123ba10c115bb88df4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:41 -0400
Subject: [PATCH 0356/1118] pywal: rebuild for Python 3.9, drop noarch

---
 srcpkgs/pywal/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pywal/template b/srcpkgs/pywal/template
index 98c4e1581e4..5a78316ef93 100644
--- a/srcpkgs/pywal/template
+++ b/srcpkgs/pywal/template
@@ -1,8 +1,7 @@
 # Template file for 'pywal'
 pkgname=pywal
 version=3.3.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="pywal"
 hostmakedepends="python3-setuptools"

From 955c6c5255389055287621af7d2fe1e4f48c58e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:42 -0400
Subject: [PATCH 0357/1118] qmk: rebuild for Python 3.9, drop noarch

---
 srcpkgs/qmk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template
index bd991d71e04..033ff91fa1f 100644
--- a/srcpkgs/qmk/template
+++ b/srcpkgs/qmk/template
@@ -1,8 +1,7 @@
 # Template file for 'qmk'
 pkgname=qmk
 version=0.0.35
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs

From 2e3884fd9b60d67b7afa527f1180fe16192d77c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:42 -0400
Subject: [PATCH 0358/1118] qomui: rebuild for Python 3.9, drop noarch

---
 srcpkgs/qomui/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/qomui/template b/srcpkgs/qomui/template
index 8063350ba06..9d832bd2387 100644
--- a/srcpkgs/qomui/template
+++ b/srcpkgs/qomui/template
@@ -1,8 +1,7 @@
 # Template file for 'qomui'
 pkgname=qomui
 version=0.8.2
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="qomui"
 hostmakedepends="python3 python3-setuptools"

From a255f79ac5f1f6eeb3074771cf46cf12d1bdf574 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:42 -0400
Subject: [PATCH 0359/1118] quodlibet: rebuild for Python 3.9, drop noarch

---
 srcpkgs/quodlibet/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template
index ba19de245ad..7261c85a6cf 100644
--- a/srcpkgs/quodlibet/template
+++ b/srcpkgs/quodlibet/template
@@ -1,8 +1,7 @@
 # Template file for 'quodlibet'
 pkgname=quodlibet
 version=4.3.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="quodlibet"
 hostmakedepends="intltool python3-devel"

From 699c20819127a7acd0a1afdb9de5dc0c7af1dc79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:42 -0400
Subject: [PATCH 0360/1118] ranger: rebuild for Python 3.9, drop noarch

---
 srcpkgs/ranger/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template
index d88da9b1ee1..13156b638a5 100644
--- a/srcpkgs/ranger/template
+++ b/srcpkgs/ranger/template
@@ -1,8 +1,7 @@
 # Template file for 'ranger'
 pkgname=ranger
 version=1.9.3
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="ranger"
 hostmakedepends="python3"

From f554006bc6d6f553307c2710ad1e76a08a8c13b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:42 -0400
Subject: [PATCH 0361/1118] rednotebook: rebuild for Python 3.9, drop noarch

---
 srcpkgs/rednotebook/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template
index fa2cb9cf445..6d2b21c43ae 100644
--- a/srcpkgs/rednotebook/template
+++ b/srcpkgs/rednotebook/template
@@ -1,8 +1,7 @@
 # Template file for 'rednotebook'
 pkgname=rednotebook
 version=2.19
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3"
 depends="desktop-file-utils gtksourceview hicolor-icon-theme python3-enchant

From 1cdf1d3203569b7294c4a9a1c4e0f3e6edb461a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:42 -0400
Subject: [PATCH 0362/1118] remhind: rebuild for Python 3.9, drop noarch

---
 srcpkgs/remhind/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/remhind/template b/srcpkgs/remhind/template
index 0f4e4047520..a4b7362e487 100644
--- a/srcpkgs/remhind/template
+++ b/srcpkgs/remhind/template
@@ -1,8 +1,7 @@
 # Template file for 'remhind'
 pkgname=remhind
 version=0.1.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-gobject-devel python3-cairo-devel"
 depends="python3-icalendar python3-dateutil python3-gobject python3-toml

From 86790dc22da770e998d743e62528ac9a91585ddc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:43 -0400
Subject: [PATCH 0363/1118] ripe-atlas-tools: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/ripe-atlas-tools/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ripe-atlas-tools/template b/srcpkgs/ripe-atlas-tools/template
index c5e21c4b8dc..8e82f0da29a 100644
--- a/srcpkgs/ripe-atlas-tools/template
+++ b/srcpkgs/ripe-atlas-tools/template
@@ -1,8 +1,7 @@
 # Template file for 'ripe-atlas-tools'
 pkgname=ripe-atlas-tools
 version=2.3.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="ripe/atlas/tools"
 hostmakedepends="python3-setuptools"

From 564e7978b084f6071fb857c7545fd0fab8d62b0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:43 -0400
Subject: [PATCH 0364/1118] rubber: rebuild for Python 3.9, drop noarch

---
 srcpkgs/rubber/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/rubber/template b/srcpkgs/rubber/template
index de6652231aa..1264c3642f7 100644
--- a/srcpkgs/rubber/template
+++ b/srcpkgs/rubber/template
@@ -1,8 +1,7 @@
 # Template file for 'rubber'
 pkgname=rubber
 version=1.5.1
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3 virtual?tex"

From 129ba554a678aa06ad7a67d7952c9708b8f3d2ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:43 -0400
Subject: [PATCH 0365/1118] s3cmd: rebuild for Python 3.9, drop noarch

---
 srcpkgs/s3cmd/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/s3cmd/template b/srcpkgs/s3cmd/template
index 8043233efb5..4ec5cf053a8 100644
--- a/srcpkgs/s3cmd/template
+++ b/srcpkgs/s3cmd/template
@@ -1,8 +1,7 @@
 # Template file for 's3cmd'
 pkgname=s3cmd
 version=2.1.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dateutil"

From fd191db2c9d6744448a0407fa70930a3e3bca7f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:43 -0400
Subject: [PATCH 0366/1118] safeeyes: rebuild for Python 3.9, drop noarch

---
 srcpkgs/safeeyes/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template
index c237bc503d8..223c0bd44a7 100644
--- a/srcpkgs/safeeyes/template
+++ b/srcpkgs/safeeyes/template
@@ -1,8 +1,7 @@
 # Template file for 'safeeyes'
 pkgname=safeeyes
 version=2.0.9
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="safeeyes"
 hostmakedepends="python3-setuptools"

From 996c0b4264b62e93321a028da6998a303a7a41bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:43 -0400
Subject: [PATCH 0367/1118] salt: rebuild for Python 3.9, drop noarch

---
 srcpkgs/salt/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 80525f92686..f32b4e29e8d 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,8 +1,7 @@
 # Template file for 'salt'
 pkgname=salt
 version=3001.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq

From da95559cc26a299a117aab5114fe1100f73aba1c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:44 -0400
Subject: [PATCH 0368/1118] scapy: rebuild for Python 3.9, drop noarch

---
 srcpkgs/scapy/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/scapy/template b/srcpkgs/scapy/template
index 36972bfd461..b2924e1a171 100644
--- a/srcpkgs/scapy/template
+++ b/srcpkgs/scapy/template
@@ -1,8 +1,7 @@
 # Template file for 'scapy'
 pkgname=scapy
 version=2.4.3
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="scapy"
 hostmakedepends="python3-setuptools"

From 4f069465d9d5db6707e2224b5ce170bc0fb7b797 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:44 -0400
Subject: [PATCH 0369/1118] screenplain: rebuild for Python 3.9, drop noarch

---
 srcpkgs/screenplain/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/screenplain/template b/srcpkgs/screenplain/template
index e3ce1bc7ff2..9cf49d0b011 100644
--- a/srcpkgs/screenplain/template
+++ b/srcpkgs/screenplain/template
@@ -1,8 +1,7 @@
 # Template file for 'screenplain'
 pkgname=screenplain
 version=0.9.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-reportlab"

From 9e29df577d85a386ef78321ea2aa22176bb4be61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:44 -0400
Subject: [PATCH 0370/1118] seafile-libclient: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/seafile-libclient/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 4db42506d81..351091344d0 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
 version=7.0.9
-revision=1
+revision=2
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -39,7 +39,6 @@ seafile-libclient-devel_package() {
 seafile-libclient-python3_package() {
 	short_desc="Cloud storage system - Python3 bindings"
 	depends="libsearpc-python3"
-	archs=noarch
 	pkg_install() {
 		vmove usr/lib/python3*
 	}
@@ -49,7 +48,6 @@ seafile-cli_package() {
 	short_desc="Cloud storage system - client CLI"
 	depends="seafile-libclient-python3 ${sourcepkg}>=${version}_${revision}"
 	python_version=3
-	archs=noarch
 	pkg_install() {
 		vmove usr/bin/seaf-cli
 		vmove usr/share/man/man1/seaf-cli.1

From 1641e88f5b25d58e39d1f246c815d42a7fc9740f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:44 -0400
Subject: [PATCH 0371/1118] setconf: rebuild for Python 3.9, drop noarch

---
 srcpkgs/setconf/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/setconf/template b/srcpkgs/setconf/template
index 8191947a20b..7798af93dd4 100644
--- a/srcpkgs/setconf/template
+++ b/srcpkgs/setconf/template
@@ -1,8 +1,7 @@
 # Template file for 'setconf'
 pkgname=setconf
 version=0.7.7
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="setconf.py"
 hostmakedepends="python3-setuptools"
@@ -27,7 +26,6 @@ post_install() {
 }
 
 python3-setconf_package() {
-	archs=noarch
 	build_style=meta
 	short_desc+=" - transitional dummy package"
 	depends="setconf"

From fbc9f9af6f89164261b3de540c0eeb7f4fe5a3aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:44 -0400
Subject: [PATCH 0372/1118] shiboken2: rebuild for Python 3.9, drop noarch

---
 srcpkgs/shiboken2/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index 4cd7da661b0..20ea5aae7e2 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
 version=5.15.0
-revision=1
+revision=2
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
@@ -55,12 +55,10 @@ python3-shiboken_package() {
 	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
 	depends="python3-shiboken2-${version}_${revision}"
 	build_style=meta
-	archs=noarch
 }
 
 libshiboken-python3_package() {
 	short_desc="Python3 shiboken2 bindings - tranditional dummy pkg"
 	depends="python3-shiboken2-${version}_${revision}"
 	build_style=meta
-	archs=noarch
 }

From d0183295fca8b7b96ca73ca7b7e4d8e20c9aeb18 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:45 -0400
Subject: [PATCH 0373/1118] sonata: rebuild for Python 3.9, drop noarch

---
 srcpkgs/sonata/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/sonata/template b/srcpkgs/sonata/template
index 3a88e08a988..f4456abd175 100644
--- a/srcpkgs/sonata/template
+++ b/srcpkgs/sonata/template
@@ -1,8 +1,7 @@
 # Template file for 'sonata'
 pkgname=sonata
 version=1.7b1
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-mpd2 python3-gobject gtk+3 ${hostmakedepends}"

From 73cce03116f5f2c78c5ec5dccc072067f83f68a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:45 -0400
Subject: [PATCH 0374/1118] speedtest-cli: rebuild for Python 3.9, drop noarch

---
 srcpkgs/speedtest-cli/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
index c65d9fd631d..f797d366680 100644
--- a/srcpkgs/speedtest-cli/template
+++ b/srcpkgs/speedtest-cli/template
@@ -1,8 +1,7 @@
 # Template file for 'speedtest-cli'
 pkgname=speedtest-cli
 version=2.1.2
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="speedtest.py"
 hostmakedepends="python3-setuptools"

From b261e8a7e3dbfb9172920ea4b925fe595104760e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:45 -0400
Subject: [PATCH 0375/1118] sshuttle: rebuild for Python 3.9, drop noarch

---
 srcpkgs/sshuttle/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template
index c642a07cd37..b7e8505d4fa 100644
--- a/srcpkgs/sshuttle/template
+++ b/srcpkgs/sshuttle/template
@@ -1,8 +1,7 @@
 # Template file for 'sshuttle'
 pkgname=sshuttle
 version=1.0.4
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"
 depends="python3-setuptools iptables"

From fe4ae7a333cb21b6e7402687d82c89054d1ef873 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:45 -0400
Subject: [PATCH 0376/1118] stcgal: rebuild for Python 3.9, drop noarch

---
 srcpkgs/stcgal/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/stcgal/template b/srcpkgs/stcgal/template
index d75e88837cc..df13d3b770f 100644
--- a/srcpkgs/stcgal/template
+++ b/srcpkgs/stcgal/template
@@ -1,8 +1,7 @@
 # Template file for 'stcgal'
 pkgname=stcgal
 version=1.6
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="stcgal"
 hostmakedepends="python3-setuptools"

From 1654a3d9a67faf3d7dc81947378713f5c70a884e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:45 -0400
Subject: [PATCH 0377/1118] stig: rebuild for Python 3.9, drop noarch

---
 srcpkgs/stig/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index abe5f3b563c..ee52d60d001 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,8 +1,7 @@
 # Template file for 'stig'
 pkgname=stig
 version=0.10.1a
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"

From ea8675052f68326621ec3e9d636c87a0e0e4c6ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:45 -0400
Subject: [PATCH 0378/1118] system-config-printer: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/system-config-printer/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template
index c9fd88c7344..003b333b1ef 100644
--- a/srcpkgs/system-config-printer/template
+++ b/srcpkgs/system-config-printer/template
@@ -1,7 +1,7 @@
 # Template file for 'system-config-printer'
 pkgname=system-config-printer
 version=1.5.11
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-udev-rules"
 make_build_args="udevhelperdir=/usr/lib/udev"
@@ -20,7 +20,6 @@ distfiles="${homepage}/releases/download/${version}/system-config-printer-${vers
 checksum=ab4a4553f536487bf2be1143529749ed9926edd84bd97c2b42666a7111d60b7f
 
 python3-cupshelpers_package() {
-	archs=noarch
 	depends="python3-cups python3-dbus python3-requests"
 	short_desc="Python utility modules around the CUPS printing system"
 	pycompile_module="cupshelpers"

From 8d342f73aea7e7b0253ad291b85beaf48593ca4d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:46 -0400
Subject: [PATCH 0379/1118] tekaim: rebuild for Python 3.9, drop noarch

---
 srcpkgs/tekaim/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/tekaim/template b/srcpkgs/tekaim/template
index bd60dcc57a6..90f03cafaf7 100644
--- a/srcpkgs/tekaim/template
+++ b/srcpkgs/tekaim/template
@@ -1,8 +1,7 @@
 # Template file for 'tekaim'
 pkgname=tekaim
 version=1.6.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 hostmakedepends="python3"
 depends="curl maim python3 xclip"

From e4f81fac14da87298779a065992400a0d714d668 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:46 -0400
Subject: [PATCH 0380/1118] termdown: rebuild for Python 3.9, drop noarch

---
 srcpkgs/termdown/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/termdown/template b/srcpkgs/termdown/template
index d9efe27f2db..7e136c34608 100644
--- a/srcpkgs/termdown/template
+++ b/srcpkgs/termdown/template
@@ -1,8 +1,7 @@
 # Template file for 'termdown'
 pkgname=termdown
 version=1.17.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-dateutil python3-click python3-pyfiglet"

From 0c61138716aa4c1baba8d3fdbcb161fa54477886 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:46 -0400
Subject: [PATCH 0381/1118] terminal_markdown_viewer: rebuild for Python 3.9,
 drop noarch

---
 srcpkgs/terminal_markdown_viewer/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/terminal_markdown_viewer/template b/srcpkgs/terminal_markdown_viewer/template
index ba3fcfdc8d6..b13f8ac93fb 100644
--- a/srcpkgs/terminal_markdown_viewer/template
+++ b/srcpkgs/terminal_markdown_viewer/template
@@ -1,8 +1,7 @@
 # Template file for 'terminal_markdown_viewer'
 pkgname=terminal_markdown_viewer
 version=1.6.3
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="mdv"
 hostmakedepends="python3-setuptools"

From 0a6676ad3caa209fe14991510db75ca2764556b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:46 -0400
Subject: [PATCH 0382/1118] terminator: rebuild for Python 3.9, drop noarch

---
 srcpkgs/terminator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terminator/template b/srcpkgs/terminator/template
index a96189ac064..644c42b5af9 100644
--- a/srcpkgs/terminator/template
+++ b/srcpkgs/terminator/template
@@ -1,7 +1,7 @@
 # Template file for 'terminator'
 pkgname=terminator
 version=1.92
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-setuptools"
 depends="desktop-file-utils gsettings-desktop-schemas libkeybinder3 libnotify

From 8d4ada6bc20896f96baecb226a232c9d5efd973f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:46 -0400
Subject: [PATCH 0383/1118] termtosvg: rebuild for Python 3.9, drop noarch

---
 srcpkgs/termtosvg/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/termtosvg/template b/srcpkgs/termtosvg/template
index 431d0945140..1773e20868d 100644
--- a/srcpkgs/termtosvg/template
+++ b/srcpkgs/termtosvg/template
@@ -1,8 +1,7 @@
 # Template file for 'termtosvg'
 pkgname=termtosvg
 version=1.1.0
-revision=1
-archs="noarch"
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pyte python3-lxml python3-wcwidth"

From fd9f37fcd2094a204c0dcb9073da1e89b5ec8943 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:47 -0400
Subject: [PATCH 0384/1118] thefuck: rebuild for Python 3.9, drop noarch

---
 srcpkgs/thefuck/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 708971811d3..33617cf872c 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,8 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
 version=3.29
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 pycompile_module="thefuck"
 hostmakedepends="python3-setuptools"

From 68195dd7d1e6682a47d53a763d39545e7fa1cb62 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:47 -0400
Subject: [PATCH 0385/1118] thinkpad-scripts: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/thinkpad-scripts/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/thinkpad-scripts/template b/srcpkgs/thinkpad-scripts/template
index 855d42492fb..8cd66a271f3 100644
--- a/srcpkgs/thinkpad-scripts/template
+++ b/srcpkgs/thinkpad-scripts/template
@@ -1,8 +1,7 @@
 # Template file for 'thinkpad-scripts'
 pkgname=thinkpad-scripts
 version=4.12.0
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="tps"
 hostmakedepends="gettext python3-setuptools"

From a3c5753f0c91878393c4344a7dc1cd32605d5973 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:47 -0400
Subject: [PATCH 0386/1118] todoman: rebuild for Python 3.9, drop noarch

---
 srcpkgs/todoman/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/todoman/template b/srcpkgs/todoman/template
index fb7e4609e85..4eecfc758b2 100644
--- a/srcpkgs/todoman/template
+++ b/srcpkgs/todoman/template
@@ -1,8 +1,7 @@
 # Template file for 'todoman'
 pkgname=todoman
 version=3.8.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-icalendar python3-urwid python3-xdg python3-parsedatetime

From 542fb54f2546b3b40024339a02120c26d7b9f591 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:47 -0400
Subject: [PATCH 0387/1118] toot: rebuild for Python 3.9, drop noarch

---
 srcpkgs/toot/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index e3754e566d1..08fdeba7978 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,8 +1,7 @@
 # Template file for 'toot'
 pkgname=toot
 version=0.27.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth

From 804c50a75138ae6e7ed5372dde662d3ad98c1b4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:47 -0400
Subject: [PATCH 0388/1118] trackma: rebuild for Python 3.9, drop noarch

---
 srcpkgs/trackma/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/trackma/template b/srcpkgs/trackma/template
index 32f4977ac46..bfa1215b46c 100644
--- a/srcpkgs/trackma/template
+++ b/srcpkgs/trackma/template
@@ -1,8 +1,7 @@
 # Template file for 'trackma'
 pkgname=trackma
 version=0.8.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-urwid python3-gobject"

From 4faa1bd332b143bfe6552f6f9e88eee0b0b56f59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:47 -0400
Subject: [PATCH 0389/1118] tryton: rebuild for Python 3.9, drop noarch

---
 srcpkgs/tryton/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/tryton/template b/srcpkgs/tryton/template
index cd18ec521b8..45f55261859 100644
--- a/srcpkgs/tryton/template
+++ b/srcpkgs/tryton/template
@@ -1,8 +1,7 @@
 # Template file for 'tryton'
 pkgname=tryton
 version=5.4.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="tryton"
 hostmakedepends="python3-setuptools"

From 955c3ceb16495de5d23328185279856677126789 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:48 -0400
Subject: [PATCH 0390/1118] tuimoji: rebuild for Python 3.9, drop noarch

---
 srcpkgs/tuimoji/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/tuimoji/template b/srcpkgs/tuimoji/template
index 132d5a5cd3c..d011d6e76c8 100644
--- a/srcpkgs/tuimoji/template
+++ b/srcpkgs/tuimoji/template
@@ -1,8 +1,7 @@
 # Template file for 'tuimoji'
 pkgname=tuimoji
 version=1.0.0
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 pycompile_module="tuimoji"
 hostmakedepends="python3-setuptools"

From 7034cf31580f9a7fd01b9dd98bf69d387c03fcbc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:48 -0400
Subject: [PATCH 0391/1118] tuir: rebuild for Python 3.9, drop noarch

---
 srcpkgs/tuir/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/tuir/template b/srcpkgs/tuir/template
index 5d45f9f647c..63f354846e2 100644
--- a/srcpkgs/tuir/template
+++ b/srcpkgs/tuir/template
@@ -1,8 +1,7 @@
 # Template file for 'tuir'
 pkgname=tuir
 version=1.29.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="$pkgname-v$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -20,7 +19,6 @@ post_install() {
 }
 
 rtv_package() {
-	archs=noarch
 	build_style=meta
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc="Simple terminal viewer for Reddit (transitional dummy package)"

From 4653cf6b531104e28bcd7d6978ac03cb848fb830 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:48 -0400
Subject: [PATCH 0392/1118] tzupdate: rebuild for Python 3.9, drop noarch

---
 srcpkgs/tzupdate/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/tzupdate/template b/srcpkgs/tzupdate/template
index 382a653d9d4..4fd4f8649b5 100644
--- a/srcpkgs/tzupdate/template
+++ b/srcpkgs/tzupdate/template
@@ -1,8 +1,7 @@
 # Template file for 'tzupdate'
 pkgname=tzupdate
 version=2.0.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests"

From 3e9f75c07df892d3c6b4bd882e5c04cf40ccbf9e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:48 -0400
Subject: [PATCH 0393/1118] udiskie: rebuild for Python 3.9, drop noarch

---
 srcpkgs/udiskie/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/udiskie/template b/srcpkgs/udiskie/template
index 36515e7f3f7..47c25a730c1 100644
--- a/srcpkgs/udiskie/template
+++ b/srcpkgs/udiskie/template
@@ -1,8 +1,7 @@
 # Template file for 'udiskie'
 pkgname=udiskie
 version=2.2.0
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools python3-gobject"
 depends="gtk+3 libnotify python3-docopt python3-gobject python3-keyutils

From d514b7bb57344ef6eac397fbfb8eb689c8c03547 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:48 -0400
Subject: [PATCH 0394/1118] ufw: rebuild for Python 3.9, drop noarch

---
 srcpkgs/ufw/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 0bf2a3a0b76..0892c610583 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,8 +1,7 @@
 # Template file for 'ufw'
 pkgname=ufw
 version=0.36
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 pycompile_module="ufw"
 conf_files="

From 82c0ff056066b5ca4e62bc4d60aa8a3106d01b4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:49 -0400
Subject: [PATCH 0395/1118] unknown-horizons: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/unknown-horizons/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/unknown-horizons/template b/srcpkgs/unknown-horizons/template
index 6e81970800d..56404addb86 100644
--- a/srcpkgs/unknown-horizons/template
+++ b/srcpkgs/unknown-horizons/template
@@ -1,8 +1,7 @@
 # Template file for 'unknown-horizons'
 pkgname=unknown-horizons
 version=2019.1
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 hostmakedepends="python3 intltool git python3-Pillow"
 depends="python3 fifengine python3-yaml"

From e20e2c135bad3db0c99f7662a789e3d3842c85fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:49 -0400
Subject: [PATCH 0396/1118] urlwatch: rebuild for Python 3.9, drop noarch

---
 srcpkgs/urlwatch/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index 6a315992919..b03f00c3418 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,8 +1,7 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
 version=2.21
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-keyring python3-minidb python3-requests

From 11d90053c53b8b3a78d39ecf8b34fbdfecbf46e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:49 -0400
Subject: [PATCH 0397/1118] variety: rebuild for Python 3.9, drop noarch

---
 srcpkgs/variety/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/variety/template b/srcpkgs/variety/template
index 651d1c87641..ff7fff5e288 100644
--- a/srcpkgs/variety/template
+++ b/srcpkgs/variety/template
@@ -1,8 +1,7 @@
 # Template file for 'variety'
 pkgname=variety
 version=0.8.3
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 pycompile_module="jumble variety variety_lib"
 pycompile_dirs="usr/share/variety/plugins"

From c2e2bb914dccd0b6195747742a85ad5099298d79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:49 -0400
Subject: [PATCH 0398/1118] vdirsyncer: rebuild for Python 3.9, drop noarch

---
 srcpkgs/vdirsyncer/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/vdirsyncer/template b/srcpkgs/vdirsyncer/template
index 13b20f5d8c0..d791cb2edd0 100644
--- a/srcpkgs/vdirsyncer/template
+++ b/srcpkgs/vdirsyncer/template
@@ -1,8 +1,7 @@
 # Template file for 'vdirsyncer'
 pkgname=vdirsyncer
 version=0.16.8
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-atomicwrites python3-click python3-click-log

From f495ab6d891eb836a4142c97543e76d0d875529b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:49 -0400
Subject: [PATCH 0399/1118] vidcutter: rebuild for Python 3.9, drop noarch

---
 srcpkgs/vidcutter/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template
index 6ca85d4e766..1fc9b4e50ab 100644
--- a/srcpkgs/vidcutter/template
+++ b/srcpkgs/vidcutter/template
@@ -1,11 +1,9 @@
 # Template file for 'vidcutter'
 pkgname=vidcutter
 version=6.0.0
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
-pycompile_module="vidcutter"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Cython"
 makedepends="mpv-devel python3-devel"
 depends="desktop-file-utils hicolor-icon-theme ffmpeg mpv mediainfo
  python3-PyOpenGL python3-PyQt5 python3-setuptools"
@@ -15,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/ozmartian/vidcutter"
 distfiles="https://github.com/ozmartian/vidcutter/archive/${version}.tar.gz"
 checksum=c09be7eceaf42ff7211fe3b8125279c4fec7f7d251d272b61d579e426bd4e2c2
+
+pre_build() {
+	rm -f vidcutter/libs/pympv/mpv.c
+}

From e678a6b8bc64ae22b59858f9f5de8f59e8fb1f03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:49 -0400
Subject: [PATCH 0400/1118] virtme: rebuild for Python 3.9, drop noarch

---
 srcpkgs/virtme/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/virtme/template b/srcpkgs/virtme/template
index ebf37c59c6c..3f432f493a7 100644
--- a/srcpkgs/virtme/template
+++ b/srcpkgs/virtme/template
@@ -1,8 +1,7 @@
 # Template file for 'virtme'
 pkgname=virtme
 version=0.1.1
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="virtme"
 hostmakedepends="python3-setuptools"

From 6e3f9d3eb3c321e442b3c85309509568c9fd831c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:50 -0400
Subject: [PATCH 0401/1118] virtualenvwrapper: rebuild for Python 3.9, drop
 noarch

---
 srcpkgs/virtualenvwrapper/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/virtualenvwrapper/template b/srcpkgs/virtualenvwrapper/template
index 55846f10531..f007b7fec02 100644
--- a/srcpkgs/virtualenvwrapper/template
+++ b/srcpkgs/virtualenvwrapper/template
@@ -1,8 +1,7 @@
 # Template file for 'virtualenvwrapper'
 pkgname=virtualenvwrapper
 version=4.8.4
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 pycompile_module="virtualenvwrapper"
 hostmakedepends="python3-setuptools python3-pbr"

From c34a4c9880ab0315ed3ff4442fc345568afc8e4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:50 -0400
Subject: [PATCH 0402/1118] visidata: rebuild for Python 3.9, drop noarch

---
 srcpkgs/visidata/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index c5c3ae7c82e..e567d156353 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,8 +1,7 @@
 # Template file for 'visidata'
 pkgname=visidata
 version=1.5.2
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="visidata"
 hostmakedepends="python3-setuptools"

From 3c318a40bd9e25b7e5b62cb61c708cd64be9c54d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:50 -0400
Subject: [PATCH 0403/1118] voltron: rebuild for Python 3.9, drop noarch

---
 srcpkgs/voltron/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/voltron/template b/srcpkgs/voltron/template
index 23731b3e01d..310e41474fb 100644
--- a/srcpkgs/voltron/template
+++ b/srcpkgs/voltron/template
@@ -1,8 +1,7 @@
 # Template file for 'voltron'
 pkgname=voltron
 version=0.1.7
-revision=4
-archs=noarch
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-blessed python3-Flask python3-Pygments python3-pysigset

From c2a1849bcd2fb8f184a3a1150cb35f5390672af4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:50 -0400
Subject: [PATCH 0404/1118] weather: rebuild for Python 3.9, drop noarch

---
 srcpkgs/weather/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/weather/template b/srcpkgs/weather/template
index b12f1578b92..e56980adc5b 100644
--- a/srcpkgs/weather/template
+++ b/srcpkgs/weather/template
@@ -1,8 +1,7 @@
 # Template file for 'weather'
 pkgname=weather
 version=2.4.1
-revision=1
-archs=noarch
+revision=2
 depends="python3"
 conf_files="/etc/weatherrc"
 short_desc="CLI utility for current (METAR) weather conditions and forecasts"

From fe072610596de84e263333364a04f1552c79e150 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:50 -0400
Subject: [PATCH 0405/1118] wfuzz: rebuild for Python 3.9, drop noarch

---
 srcpkgs/wfuzz/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wfuzz/template b/srcpkgs/wfuzz/template
index 1adef51b0b5..c0e9c174dfb 100644
--- a/srcpkgs/wfuzz/template
+++ b/srcpkgs/wfuzz/template
@@ -1,8 +1,7 @@
 # Template file for 'wfuzz'
 pkgname=wfuzz
 version=3.0.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-chardet python3-curl python3-future python3-lxml python3-parse

From 5c80bae4fe5fc2a7af4ca3903353e6876e96fffa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:51 -0400
Subject: [PATCH 0406/1118] wpgtk: rebuild for Python 3.9, drop noarch

---
 srcpkgs/wpgtk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wpgtk/template b/srcpkgs/wpgtk/template
index 4692074cd04..a851b76ff27 100644
--- a/srcpkgs/wpgtk/template
+++ b/srcpkgs/wpgtk/template
@@ -1,8 +1,7 @@
 # Template file for 'wpgtk'
 pkgname=wpgtk
 version=6.1.3
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-Pillow pywal libxslt"

From 1e98618b0d235bce88ed93d3d4573169db45cd6b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:51 -0400
Subject: [PATCH 0407/1118] wpull: rebuild for Python 3.9, drop noarch

---
 srcpkgs/wpull/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/wpull/template b/srcpkgs/wpull/template
index 621e1c85428..ad1ce72103f 100644
--- a/srcpkgs/wpull/template
+++ b/srcpkgs/wpull/template
@@ -1,8 +1,7 @@
 # Template file for 'wpull'
 pkgname=wpull
 version=2.0.3
-revision=2
-archs=noarch
+revision=3
 build_style=python3-module
 pycompile_module="wpull"
 hostmakedepends="python3-setuptools"

From 7f5af73fd41ff784b89af6e2a1b60c0b4e0e33fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:51 -0400
Subject: [PATCH 0408/1118] xcb-proto: rebuild for Python 3.9, drop noarch

---
 srcpkgs/xcb-proto/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template
index afc0d260a23..7301e58b1b2 100644
--- a/srcpkgs/xcb-proto/template
+++ b/srcpkgs/xcb-proto/template
@@ -1,8 +1,7 @@
 # Template file for 'xcb-proto'
 pkgname=xcb-proto
 version=1.14
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-configure
 hostmakedepends="python3"
 makedepends="libxml2"

From b3cf4f753c8e6e5a69949beb0ed041c316e29372 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:51 -0400
Subject: [PATCH 0409/1118] xdot: rebuild for Python 3.9, drop noarch

---
 srcpkgs/xdot/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/xdot/template b/srcpkgs/xdot/template
index 85b33af2222..2b4e20c77ef 100644
--- a/srcpkgs/xdot/template
+++ b/srcpkgs/xdot/template
@@ -1,8 +1,7 @@
 # Template file for 'xdot'
 pkgname=xdot
 version=1.1
-revision=3
-archs=noarch
+revision=4
 wrksrc="xdot.py-${version}"
 build_style=python3-module
 pycompile_module="xdot"

From 98464bec2013d4b5c61faf299d55a90cd26f4658 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:51 -0400
Subject: [PATCH 0410/1118] xkcdpass: rebuild for Python 3.9, drop noarch

---
 srcpkgs/xkcdpass/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template
index 37fb6872079..53f85c213d1 100644
--- a/srcpkgs/xkcdpass/template
+++ b/srcpkgs/xkcdpass/template
@@ -1,8 +1,7 @@
 # Template file for 'xkcdpass'
 pkgname=xkcdpass
 version=1.17.3
-revision=2
-archs=noarch
+revision=3
 wrksrc="XKCD-password-generator-xkcdpass-${version}"
 build_style=python3-module
 pycompile_module="xkcdpass"

From 7cde6a4cdf7b0896ffd0dd48cee6fedd74ce6faa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:52 -0400
Subject: [PATCH 0411/1118] you-get: rebuild for Python 3.9, drop noarch

---
 srcpkgs/you-get/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index b0bf348d351..fb573201ebb 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,8 +1,7 @@
 # Template file for 'you-get'
 pkgname=you-get
 version=0.4.1456
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pysocks python3-setuptools"

From 0172733abbd0629a36326a6bd1c9caa4f7da8686 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:52 -0400
Subject: [PATCH 0412/1118] ytcc: rebuild for Python 3.9, drop noarch

---
 srcpkgs/ytcc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ytcc/template b/srcpkgs/ytcc/template
index bef3366f910..4e6979b3e2f 100644
--- a/srcpkgs/ytcc/template
+++ b/srcpkgs/ytcc/template
@@ -1,8 +1,7 @@
 # Template file for 'ytcc'
 pkgname=ytcc
 version=1.8.2
-revision=3
-archs=noarch
+revision=4
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-SQLAlchemy python3-feedparser python3-lxml python3-youtube-dl

From c4f7d0409a92bc7c434764800afdc3a7830d4410 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:52 -0400
Subject: [PATCH 0413/1118] ytmdl: rebuild for Python 3.9, drop noarch

---
 srcpkgs/ytmdl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index 7952b5662cd..8a53de5f5a2 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,8 +1,7 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
 version=2020.07.26
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="ffmpeg youtube-dl python3-mutagen python3-requests python3-colorama

From a0033e2669afc06360bf941d951cf3f4b42e9432 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:52 -0400
Subject: [PATCH 0414/1118] yturl: rebuild for Python 3.9, drop noarch

---
 srcpkgs/yturl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/yturl/template b/srcpkgs/yturl/template
index bc9e6e418c2..138684c8831 100644
--- a/srcpkgs/yturl/template
+++ b/srcpkgs/yturl/template
@@ -1,8 +1,7 @@
 # Template file for 'yturl'
 pkgname=yturl
 version=2.0.2
-revision=4
-archs=noarch
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools texinfo"
 depends="python3-setuptools python3-requests python3-six"

From e4e6c09567e1b4acaa771378ca6b8c262d550249 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:50:52 -0400
Subject: [PATCH 0415/1118] zim: rebuild for Python 3.9, drop noarch

---
 srcpkgs/zim/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template
index 7ee098a3c3a..62ed7762b72 100644
--- a/srcpkgs/zim/template
+++ b/srcpkgs/zim/template
@@ -1,8 +1,7 @@
 # Template file for 'zim'
 pkgname=zim
 version=0.73.2
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-gobject python3-xdg gtk+3"
 depends="python3-gobject python3-xdg gtk+3 desktop-file-utils"

From e6d4a850eceb8bd54157e01fa7b2d3a8cc76045d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:53 -0400
Subject: [PATCH 0416/1118] DarkRadiant: rebuild for Python 3.9

---
 srcpkgs/DarkRadiant/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index fdc430cdf52..08a9d0ac14a 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
 # Template file for 'DarkRadiant'
 pkgname=DarkRadiant
 version=2.8.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-darkmod-plugins --with-wx-config=wx-config-gtk3
  PYTHON_CONFIG=python3-config pc_cv_python_req_version_3_8_0=yes"

From 234b289fa22698ff0bb15d4ef923294812125a9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:53 -0400
Subject: [PATCH 0417/1118] Electron-Cash: rebuild for Python 3.9

---
 srcpkgs/Electron-Cash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Electron-Cash/template b/srcpkgs/Electron-Cash/template
index a498b199a61..bf70e635703 100644
--- a/srcpkgs/Electron-Cash/template
+++ b/srcpkgs/Electron-Cash/template
@@ -1,7 +1,7 @@
 # Template file for 'Electron-Cash'
 pkgname=Electron-Cash
 version=4.1.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-PyQt5-devel-tools"
 depends="python3-PyQt5 python3-PyQt5-svg python3-qrcode python3-dateutil

From 74db8941cee29efd81bc2e0705bbffbb0f0ccb50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:53 -0400
Subject: [PATCH 0418/1118] Komikku: rebuild for Python 3.9

---
 srcpkgs/Komikku/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index c159eddf088..8420164111f 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
 # Template file for 'Komikku'
 pkgname=Komikku
 version=0.21.1
-revision=1
+revision=2
 wrksrc=Komikku-v${version}
 build_style=meson
 hostmakedepends="gettext glib-devel gobject-introspection pkg-config"

From cae1809f4098a38745580d973960ddb5c13c048a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0419/1118] OpenLP: rebuild for Python 3.9

---
 srcpkgs/OpenLP/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template
index 22122ef8a99..0bf83bb6b6d 100644
--- a/srcpkgs/OpenLP/template
+++ b/srcpkgs/OpenLP/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenLP'
 pkgname=OpenLP
 version=2.4.6
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools qt5-host-tools"
 depends="python3-BeautifulSoup4 python3-PyQt5-multimedia python3-PyQt5-opengl

From 8e477ef68c91b466110da2f98c9b05b4eac911ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0420/1118] PyInstaller: rebuild for Python 3.9

---
 srcpkgs/PyInstaller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PyInstaller/template b/srcpkgs/PyInstaller/template
index 043ae64147b..487f2ac3b82 100644
--- a/srcpkgs/PyInstaller/template
+++ b/srcpkgs/PyInstaller/template
@@ -1,7 +1,7 @@
 # Template file for 'PyInstaller'
 pkgname=PyInstaller
 version=4.0
-revision=1
+revision=2
 wrksrc="pyinstaller-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0e318f9f03cf392dd56702fd43c5eda658fda42a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0421/1118] ReText: rebuild for Python 3.9

---
 srcpkgs/ReText/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ReText/template b/srcpkgs/ReText/template
index 68f03fc5a60..99c00396217 100644
--- a/srcpkgs/ReText/template
+++ b/srcpkgs/ReText/template
@@ -1,7 +1,7 @@
 # Template file for 'ReText'
 pkgname=ReText
 version=7.1.0
-revision=1
+revision=2
 wrksrc="${pkgname,,}-${version}"
 build_style=python3-module
 hostmakedepends="ImageMagick python3 qt5-host-tools qt5-tools python3-setuptools"

From 38de06aa9f9791ca48efe49b17c8652f96908aa0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0422/1118] SoapySDR: rebuild for Python 3.9

---
 srcpkgs/SoapySDR/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/SoapySDR/template b/srcpkgs/SoapySDR/template
index 060259d2708..a380dfb5845 100644
--- a/srcpkgs/SoapySDR/template
+++ b/srcpkgs/SoapySDR/template
@@ -1,7 +1,7 @@
 # Template file for 'SoapySDR'
 pkgname=SoapySDR
 version=0.7.2
-revision=1
+revision=2
 wrksrc="${pkgname}-soapy-sdr-${version}"
 build_style=cmake
 hostmakedepends="doxygen swig"

From 24dc2e6649a6b486589e5193eb9f175fb55f40b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0423/1118] Trimage: rebuild for Python 3.9

---
 srcpkgs/Trimage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Trimage/template b/srcpkgs/Trimage/template
index c9f4b047ccd..5c97aec1862 100644
--- a/srcpkgs/Trimage/template
+++ b/srcpkgs/Trimage/template
@@ -1,7 +1,7 @@
 # Template file for 'Trimage'
 pkgname=Trimage
 version=1.0.6
-revision=2
+revision=3
 wrksrc="Trimage-${version}"
 build_style=python3-module
 hostmakedepends="python3"

From 531bef471b51fb8fea789f3c34e3b62eb49ad133 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0424/1118] Uranium: rebuild for Python 3.9

---
 srcpkgs/Uranium/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 7c4e324d489..35a15a395aa 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
 version=4.7.1
-revision=1
+revision=2
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3"

From 76322d015c9b9506e3ee073afd68f06f4f9ec7f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0425/1118] afew: rebuild for Python 3.9

---
 srcpkgs/afew/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/afew/template b/srcpkgs/afew/template
index 8dac250a155..e89ee064a6c 100644
--- a/srcpkgs/afew/template
+++ b/srcpkgs/afew/template
@@ -1,7 +1,7 @@
 # Template file for 'afew'
 pkgname=afew
 version=3.0.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx pkg-config"
 depends="notmuch-python3 python3-dkimpy python3-chardet notmuch"

From 06c7c9968c735ff5b56a4c365e19841b329a9ea8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:54 -0400
Subject: [PATCH 0426/1118] albert: rebuild for Python 3.9

---
 srcpkgs/albert/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/albert/template b/srcpkgs/albert/template
index 0fea8c8b7a1..b08a0320f4f 100644
--- a/srcpkgs/albert/template
+++ b/srcpkgs/albert/template
@@ -1,7 +1,7 @@
 # Template file for 'albert'
 pkgname=albert
 version=0.16.1
-revision=2
+revision=3
 _plugins_hash=029bd8ccb58c4452bd82ab42be8739f1639e42d4
 _pybind_version=2.2.4
 build_style=cmake

From 1413eca7bb41fc1918915acb5900d6dbf772c6b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0427/1118] alot: rebuild for Python 3.9

---
 srcpkgs/alot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 04f2b8fa619..4d590485452 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,7 +1,7 @@
 # Template file for 'alot'
 pkgname=alot
 version=0.9.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"
 depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj

From 9a0afb81fe2362472bd90d6968270ce9bfb4a8dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0428/1118] apostrophe: rebuild for Python 3.9

---
 srcpkgs/apostrophe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 6fce53d37e0..97ceb5d8992 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,7 +1,7 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
 version=2.2.0.3
-revision=1
+revision=2
 wrksrc=apostrophe-v$version
 build_style=meson
 build_helper=gir

From 5efc34bb23162ace571ae033989f0f9efe2eca77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0429/1118] attic: rebuild for Python 3.9

---
 srcpkgs/attic/patches/python-3.8.patch | 197 -------------------------
 srcpkgs/attic/template                 |  14 +-
 2 files changed, 10 insertions(+), 201 deletions(-)
 delete mode 100644 srcpkgs/attic/patches/python-3.8.patch

diff --git a/srcpkgs/attic/patches/python-3.8.patch b/srcpkgs/attic/patches/python-3.8.patch
deleted file mode 100644
index d319e7f6dcb..00000000000
--- a/srcpkgs/attic/patches/python-3.8.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- attic/crypto.c.orig	2019-12-24 10:46:04.053414948 +0100
-+++ attic/crypto.c	2019-12-24 10:47:12.038209708 +0100
-@@ -3566,12 +3566,12 @@ static int __Pyx_GetException(PyObject *
-     *value = local_value;
-     *tb = local_tb;
- #if CYTHON_COMPILING_IN_CPYTHON
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = local_type;
--    tstate->exc_value = local_value;
--    tstate->exc_traceback = local_tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = local_type;
-+    tstate->curexc_value = local_value;
-+    tstate->curexc_traceback = local_tb;
-     Py_XDECREF(tmp_type);
-     Py_XDECREF(tmp_value);
-     Py_XDECREF(tmp_tb);
-@@ -3593,12 +3593,12 @@ static CYTHON_INLINE void __Pyx_Exceptio
-     PyObject *tmp_type, *tmp_value, *tmp_tb;
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyThreadState *tstate = PyThreadState_GET();
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = *type;
--    tstate->exc_value = *value;
--    tstate->exc_traceback = *tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = *type;
-+    tstate->curexc_value = *value;
-+    tstate->curexc_traceback = *tb;
- #else
-     PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb);
-     PyErr_SetExcInfo(*type, *value, *tb);
-@@ -3611,9 +3611,9 @@ static CYTHON_INLINE void __Pyx_Exceptio
- static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyThreadState *tstate = PyThreadState_GET();
--    *type = tstate->exc_type;
--    *value = tstate->exc_value;
--    *tb = tstate->exc_traceback;
-+    *type = tstate->curexc_type;
-+    *value = tstate->curexc_value;
-+    *tb = tstate->curexc_traceback;
-     Py_XINCREF(*type);
-     Py_XINCREF(*value);
-     Py_XINCREF(*tb);
-@@ -3625,12 +3625,12 @@ static void __Pyx_ExceptionReset(PyObjec
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyObject *tmp_type, *tmp_value, *tmp_tb;
-     PyThreadState *tstate = PyThreadState_GET();
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = type;
--    tstate->exc_value = value;
--    tstate->exc_traceback = tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = type;
-+    tstate->curexc_value = value;
-+    tstate->curexc_traceback = tb;
-     Py_XDECREF(tmp_type);
-     Py_XDECREF(tmp_value);
-     Py_XDECREF(tmp_tb);
---- attic/hashindex.c.orig	2019-12-24 10:49:05.470535303 +0100
-+++ attic/hashindex.c	2019-12-24 10:49:36.622898937 +0100
-@@ -5186,9 +5186,9 @@ bad:
- static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyThreadState *tstate = PyThreadState_GET();
--    *type = tstate->exc_type;
--    *value = tstate->exc_value;
--    *tb = tstate->exc_traceback;
-+    *type = tstate->curexc_type;
-+    *value = tstate->curexc_value;
-+    *tb = tstate->curexc_traceback;
-     Py_XINCREF(*type);
-     Py_XINCREF(*value);
-     Py_XINCREF(*tb);
-@@ -5200,12 +5200,12 @@ static void __Pyx_ExceptionReset(PyObjec
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyObject *tmp_type, *tmp_value, *tmp_tb;
-     PyThreadState *tstate = PyThreadState_GET();
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = type;
--    tstate->exc_value = value;
--    tstate->exc_traceback = tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = type;
-+    tstate->curexc_value = value;
-+    tstate->curexc_traceback = tb;
-     Py_XDECREF(tmp_type);
-     Py_XDECREF(tmp_value);
-     Py_XDECREF(tmp_tb);
-@@ -5248,12 +5248,12 @@ static int __Pyx_GetException(PyObject *
-     *value = local_value;
-     *tb = local_tb;
- #if CYTHON_COMPILING_IN_CPYTHON
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = local_type;
--    tstate->exc_value = local_value;
--    tstate->exc_traceback = local_tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = local_type;
-+    tstate->curexc_value = local_value;
-+    tstate->curexc_traceback = local_tb;
-     Py_XDECREF(tmp_type);
-     Py_XDECREF(tmp_value);
-     Py_XDECREF(tmp_tb);
---- attic/platform_linux.c.orig	2019-12-24 10:51:25.399168631 +0100
-+++ attic/platform_linux.c	2019-12-24 10:51:34.711277325 +0100
-@@ -4517,12 +4517,12 @@ static int __Pyx_GetException(PyObject *
-     *value = local_value;
-     *tb = local_tb;
- #if CYTHON_COMPILING_IN_CPYTHON
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = local_type;
--    tstate->exc_value = local_value;
--    tstate->exc_traceback = local_tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = local_type;
-+    tstate->curexc_value = local_value;
-+    tstate->curexc_traceback = local_tb;
-     Py_XDECREF(tmp_type);
-     Py_XDECREF(tmp_value);
-     Py_XDECREF(tmp_tb);
-@@ -4544,12 +4544,12 @@ static CYTHON_INLINE void __Pyx_Exceptio
-     PyObject *tmp_type, *tmp_value, *tmp_tb;
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyThreadState *tstate = PyThreadState_GET();
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = *type;
--    tstate->exc_value = *value;
--    tstate->exc_traceback = *tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = *type;
-+    tstate->curexc_value = *value;
-+    tstate->curexc_traceback = *tb;
- #else
-     PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb);
-     PyErr_SetExcInfo(*type, *value, *tb);
-@@ -4562,9 +4562,9 @@ static CYTHON_INLINE void __Pyx_Exceptio
- static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyThreadState *tstate = PyThreadState_GET();
--    *type = tstate->exc_type;
--    *value = tstate->exc_value;
--    *tb = tstate->exc_traceback;
-+    *type = tstate->curexc_type;
-+    *value = tstate->curexc_value;
-+    *tb = tstate->curexc_traceback;
-     Py_XINCREF(*type);
-     Py_XINCREF(*value);
-     Py_XINCREF(*tb);
-@@ -4576,12 +4576,12 @@ static void __Pyx_ExceptionReset(PyObjec
- #if CYTHON_COMPILING_IN_CPYTHON
-     PyObject *tmp_type, *tmp_value, *tmp_tb;
-     PyThreadState *tstate = PyThreadState_GET();
--    tmp_type = tstate->exc_type;
--    tmp_value = tstate->exc_value;
--    tmp_tb = tstate->exc_traceback;
--    tstate->exc_type = type;
--    tstate->exc_value = value;
--    tstate->exc_traceback = tb;
-+    tmp_type = tstate->curexc_type;
-+    tmp_value = tstate->curexc_value;
-+    tmp_tb = tstate->curexc_traceback;
-+    tstate->curexc_type = type;
-+    tstate->curexc_value = value;
-+    tstate->curexc_traceback = tb;
-     Py_XDECREF(tmp_type);
-     Py_XDECREF(tmp_value);
-     Py_XDECREF(tmp_tb);
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index ebf921ea035..1b08972b359 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,12 +1,11 @@
 # Template file for 'attic'
 pkgname=attic
 version=0.16
-revision=18
+revision=19
 wrksrc="Attic-$version"
 build_style=python3-module
-pycompile_module="attic"
-hostmakedepends="python3-setuptools python3-devel libressl-devel python3-Sphinx"
-makedepends="${hostmakedepends/python3-setuptools/} acl-devel"
+hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
+makedepends="python3-devel libressl-devel acl-devel"
 depends="python3-msgpack python3-llfuse"
 short_desc="Deduplicating backup program for efficient and secure backups"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -19,6 +18,13 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		sed -i "s|\(possible_openssl_prefixes\) =.*|\1 = ['${XBPS_CROSS_BASE}/usr']|" setup.py
 	fi
+
+	local _file
+	for _file in attic/*.pyx; do
+		rm ${_file/pyx/c}
+	done
+
+	python3 setup.py sdist
 }
 post_build() {
 	PYTHONPATH=.. make -C docs man SPHINXBUILD=sphinx-build

From a973f8002ff1aab3d866ece80aaed899300a254d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0430/1118] autopep8: rebuild for Python 3.9

---
 srcpkgs/autopep8/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autopep8/template b/srcpkgs/autopep8/template
index 372634d5c1a..cf584e77be0 100644
--- a/srcpkgs/autopep8/template
+++ b/srcpkgs/autopep8/template
@@ -1,7 +1,7 @@
 # Template file for 'autopep8'
 pkgname=autopep8
 version=1.5.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pycodestyle python3-toml"

From 45467bed1390421289d176a486bfab08cf76ef25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0431/1118] awsume: rebuild for Python 3.9

---
 srcpkgs/awsume/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/awsume/template b/srcpkgs/awsume/template
index 40a6624a206..3c216c098b5 100644
--- a/srcpkgs/awsume/template
+++ b/srcpkgs/awsume/template
@@ -1,7 +1,7 @@
 # Template file for 'awsume'
 pkgname=awsume
 version=4.4.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 makedepends="python3-argcomplete python3-boto3 python3-colorama python3-coverage

From 0a78a95bdee1780528288f4e91b85b1a5424a223 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0432/1118] backblaze-b2: rebuild for Python 3.9

---
 srcpkgs/backblaze-b2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index 83d3b82b539..d613b0297fa 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,7 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
 version=1.4.2
-revision=4
+revision=5
 wrksrc="b2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2d3ee256fa309569d58d85e2fe5831a13ff5577b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0433/1118] bcc: rebuild for Python 3.9

---
 srcpkgs/bcc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 91cfa139dd9..1d35a9ed17d 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.16.0
-revision=1
+revision=2
 wrksrc="bcc"
 build_style=cmake
 configure_args="-DREVISION=${version}"

From e5e0c0c7910af06607b8ddca8280529306434d4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:55 -0400
Subject: [PATCH 0434/1118] beancount: rebuild for Python 3.9

---
 srcpkgs/beancount/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template
index 37104579030..ab1aacd4f71 100644
--- a/srcpkgs/beancount/template
+++ b/srcpkgs/beancount/template
@@ -1,7 +1,7 @@
 # Template file for 'beancount'
 pkgname=beancount
 version=2.3.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"

From ab778c5ef24696175c6d10a09ef2971b88c8f042 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0435/1118] blender: rebuild for Python 3.9

---
 srcpkgs/blender/patches/python39.patch | 153 +++++++++++++++++++++++++
 srcpkgs/blender/template               |   2 +-
 2 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/blender/patches/python39.patch

diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
new file mode 100644
index 00000000000..9c87fa95c6f
--- /dev/null
+++ b/srcpkgs/blender/patches/python39.patch
@@ -0,0 +1,153 @@
+From 56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f Mon Sep 17 00:00:00 2001
+From: Campbell Barton <ideasman42@gmail.com>
+Date: Mon, 22 Jun 2020 14:51:20 +1000
+Subject: [PATCH] Python: support building again version 3.9 (unreleased)
+
+Resolves T78089, no functional changes.
+---
+ .../blender/python/mathutils/mathutils_Matrix.c  | 16 +++++++++-------
+ .../python/mathutils/mathutils_Quaternion.c      | 14 ++++++++------
+ .../blender/python/mathutils/mathutils_Vector.c  |  6 +++---
+ 3 files changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
+index 327ee4dd1c3..63137e094b7 100644
+--- a/source/blender/python/mathutils/mathutils_Matrix.c
++++ b/source/blender/python/mathutils/mathutils_Matrix.c
+@@ -42,7 +42,8 @@ static PyObject *Matrix_copy_notest(MatrixObject *self, const float *matrix);
+ static PyObject *Matrix_copy(MatrixObject *self);
+ static PyObject *Matrix_deepcopy(MatrixObject *self, PyObject *args);
+ static int Matrix_ass_slice(MatrixObject *self, int begin, int end, PyObject *value);
+-static PyObject *matrix__apply_to_copy(PyNoArgsFunction matrix_func, MatrixObject *self);
++static PyObject *matrix__apply_to_copy(PyObject *(*matrix_func)(MatrixObject *),
++                                       MatrixObject *self);
+ static PyObject *MatrixAccess_CreatePyObject(MatrixObject *matrix, const eMatrixAccess_t type);
+ 
+ static int matrix_row_vector_check(MatrixObject *mat, VectorObject *vec, int row)
+@@ -395,14 +396,15 @@ static PyObject *Matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+   return NULL;
+ }
+ 
+-static PyObject *matrix__apply_to_copy(PyNoArgsFunction matrix_func, MatrixObject *self)
++static PyObject *matrix__apply_to_copy(PyObject *(*matrix_func)(MatrixObject *),
++                                       MatrixObject *self)
+ {
+   PyObject *ret = Matrix_copy(self);
+   if (ret) {
+-    PyObject *ret_dummy = matrix_func(ret);
++    PyObject *ret_dummy = matrix_func((MatrixObject *)ret);
+     if (ret_dummy) {
+       Py_DECREF(ret_dummy);
+-      return (PyObject *)ret;
++      return ret;
+     }
+     else { /* error */
+       Py_DECREF(ret);
+@@ -1738,7 +1740,7 @@ PyDoc_STRVAR(
+     "   .. note:: When the matrix cant be adjugated a :exc:`ValueError` exception is raised.\n");
+ static PyObject *Matrix_adjugated(MatrixObject *self)
+ {
+-  return matrix__apply_to_copy((PyNoArgsFunction)Matrix_adjugate, self);
++  return matrix__apply_to_copy(Matrix_adjugate, self);
+ }
+ 
+ PyDoc_STRVAR(
+@@ -1946,7 +1948,7 @@ PyDoc_STRVAR(Matrix_transposed_doc,
+              "   :rtype: :class:`Matrix`\n");
+ static PyObject *Matrix_transposed(MatrixObject *self)
+ {
+-  return matrix__apply_to_copy((PyNoArgsFunction)Matrix_transpose, self);
++  return matrix__apply_to_copy(Matrix_transpose, self);
+ }
+ 
+ /*---------------------------matrix.normalize() ------------------*/
+@@ -1992,7 +1994,7 @@ PyDoc_STRVAR(Matrix_normalized_doc,
+              "   :rtype: :class:`Matrix`\n");
+ static PyObject *Matrix_normalized(MatrixObject *self)
+ {
+-  return matrix__apply_to_copy((PyNoArgsFunction)Matrix_normalize, self);
++  return matrix__apply_to_copy(Matrix_normalize, self);
+ }
+ 
+ /*---------------------------matrix.zero() -----------------------*/
+diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c
+index 39d84c1ac96..7ce0ea5f249 100644
+--- a/source/blender/python/mathutils/mathutils_Quaternion.c
++++ b/source/blender/python/mathutils/mathutils_Quaternion.c
+@@ -34,7 +34,8 @@
+ 
+ #define QUAT_SIZE 4
+ 
+-static PyObject *quat__apply_to_copy(PyNoArgsFunction quat_func, QuaternionObject *self);
++static PyObject *quat__apply_to_copy(PyObject *(*quat_func)(QuaternionObject *),
++                                     QuaternionObject *self);
+ static void quat__axis_angle_sanitize(float axis[3], float *angle);
+ static PyObject *Quaternion_copy(QuaternionObject *self);
+ static PyObject *Quaternion_deepcopy(QuaternionObject *self, PyObject *args);
+@@ -463,7 +464,7 @@ PyDoc_STRVAR(Quaternion_normalized_doc,
+              "   :rtype: :class:`Quaternion`\n");
+ static PyObject *Quaternion_normalized(QuaternionObject *self)
+ {
+-  return quat__apply_to_copy((PyNoArgsFunction)Quaternion_normalize, self);
++  return quat__apply_to_copy(Quaternion_normalize, self);
+ }
+ 
+ PyDoc_STRVAR(Quaternion_invert_doc,
+@@ -490,7 +491,7 @@ PyDoc_STRVAR(Quaternion_inverted_doc,
+              "   :rtype: :class:`Quaternion`\n");
+ static PyObject *Quaternion_inverted(QuaternionObject *self)
+ {
+-  return quat__apply_to_copy((PyNoArgsFunction)Quaternion_invert, self);
++  return quat__apply_to_copy(Quaternion_invert, self);
+ }
+ 
+ PyDoc_STRVAR(Quaternion_identity_doc,
+@@ -553,7 +554,7 @@ PyDoc_STRVAR(Quaternion_conjugated_doc,
+              "   :rtype: :class:`Quaternion`\n");
+ static PyObject *Quaternion_conjugated(QuaternionObject *self)
+ {
+-  return quat__apply_to_copy((PyNoArgsFunction)Quaternion_conjugate, self);
++  return quat__apply_to_copy(Quaternion_conjugate, self);
+ }
+ 
+ PyDoc_STRVAR(Quaternion_copy_doc,
+@@ -1385,10 +1386,11 @@ static PyObject *Quaternion_new(PyTypeObject *type, PyObject *args, PyObject *kw
+   return Quaternion_CreatePyObject(quat, type);
+ }
+ 
+-static PyObject *quat__apply_to_copy(PyNoArgsFunction quat_func, QuaternionObject *self)
++static PyObject *quat__apply_to_copy(PyObject *(*quat_func)(QuaternionObject *),
++                                     QuaternionObject *self)
+ {
+   PyObject *ret = Quaternion_copy(self);
+-  PyObject *ret_dummy = quat_func(ret);
++  PyObject *ret_dummy = quat_func((QuaternionObject *)ret);
+   if (ret_dummy) {
+     Py_DECREF(ret_dummy);
+     return ret;
+diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c
+index ace7480ee81..15ae811fd91 100644
+--- a/source/blender/python/mathutils/mathutils_Vector.c
++++ b/source/blender/python/mathutils/mathutils_Vector.c
+@@ -96,10 +96,10 @@ static PyObject *Vector_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+   return Vector_CreatePyObject_alloc(vec, size, type);
+ }
+ 
+-static PyObject *vec__apply_to_copy(PyNoArgsFunction vec_func, VectorObject *self)
++static PyObject *vec__apply_to_copy(PyObject *(*vec_func)(VectorObject *), VectorObject *self)
+ {
+   PyObject *ret = Vector_copy(self);
+-  PyObject *ret_dummy = vec_func(ret);
++  PyObject *ret_dummy = vec_func((VectorObject *)ret);
+   if (ret_dummy) {
+     Py_DECREF(ret_dummy);
+     return (PyObject *)ret;
+@@ -376,7 +376,7 @@ PyDoc_STRVAR(Vector_normalized_doc,
+              "   :rtype: :class:`Vector`\n");
+ static PyObject *Vector_normalized(VectorObject *self)
+ {
+-  return vec__apply_to_copy((PyNoArgsFunction)Vector_normalize, self);
++  return vec__apply_to_copy(Vector_normalize, self);
+ }
+ 
+ PyDoc_STRVAR(Vector_resize_doc,
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 559a5311288..731f4af9f68 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.83.6
-revision=2
+revision=3
 archs="x86_64* i686* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 5e365cf098b2f8ad849e5cc2486e579410acc494 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0436/1118] blueman: rebuild for Python 3.9

---
 srcpkgs/blueman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index 852fbf37d5b..bf9519b6833 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -1,7 +1,7 @@
 # Template file for 'blueman'
 pkgname=blueman
 version=2.1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool iproute2 pkg-config python3-Cython"

From b28b6f89e6f8a0efa6ce896c216b8ac9b0dfc3f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0437/1118] borg: rebuild for Python 3.9

---
 srcpkgs/borg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index 0ede63598e1..de4d757e342 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,7 +1,7 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.1.13
-revision=2
+revision=3
 wrksrc="borgbackup-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel libressl-devel"

From 1a4e727d64465ce135b44ba049a590cdbcb1b542 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0438/1118] brltty: rebuild for Python 3.9

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 484b98efaf7..f507ca3d162 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.0
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

From 434791d39ca3bf2bf904ad3ea7ce42d25a3a568c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0439/1118] bumblebee-status: rebuild for Python 3.9

---
 srcpkgs/bumblebee-status/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template
index c31b9d8370c..38e784a52ed 100644
--- a/srcpkgs/bumblebee-status/template
+++ b/srcpkgs/bumblebee-status/template
@@ -1,7 +1,7 @@
 # Template file for 'bumblebee-status'
 pkgname=bumblebee-status
 version=2.0.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-netifaces python3-psutil python3-requests"

From 01f58655d0b1ac6133681080423a36d61168488e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0440/1118] cairo-dock-plugins: rebuild for Python 3.9

---
 srcpkgs/cairo-dock-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 00dcb011bee..6f28bf559a6 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=12
+revision=13
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 # XXX libetpan, libdbusmenu, etc

From 8559e2cada70403bdb59d2c4399875bba8557760 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0441/1118] calibre: rebuild for Python 3.9

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 444e7c2b7f6..9c904e9e5a4 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.0.1
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From 2c43436c4fc075de5e21587c5abde656615ee959 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:56 -0400
Subject: [PATCH 0442/1118] canto-curses: rebuild for Python 3.9

---
 srcpkgs/canto-curses/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template
index 4270d61c2e0..841369c23e8 100644
--- a/srcpkgs/canto-curses/template
+++ b/srcpkgs/canto-curses/template
@@ -1,7 +1,7 @@
 # Template file for 'canto-curses'
 pkgname=canto-curses
 version=0.9.9
-revision=5
+revision=6
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel ncurses-devel readline-devel"

From 3c76d0b01e7397d292633e915307027251767ef2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:57 -0400
Subject: [PATCH 0443/1118] capstone: rebuild for Python 3.9

---
 srcpkgs/capstone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template
index 7d9c46e1921..aebd3621f97 100644
--- a/srcpkgs/capstone/template
+++ b/srcpkgs/capstone/template
@@ -1,7 +1,7 @@
 # Template file for 'capstone'
 pkgname=capstone
 version=4.0.2
-revision=1
+revision=2
 build_style=gnu-makefile
 make_use_env=1
 hostmakedepends="python-setuptools python3-setuptools"

From 37bdec6686911d37aa76404460f4cfc3e56f3771 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:57 -0400
Subject: [PATCH 0444/1118] caribou: rebuild for Python 3.9

---
 srcpkgs/caribou/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index a9aa87cf23e..80e813eb161 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -1,7 +1,7 @@
 # Template file for 'caribou'
 pkgname=caribou
 version=0.4.21
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module

From e833b8e9d8d6219cfbe19e7a9ce8c33999075f27 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:57 -0400
Subject: [PATCH 0445/1118] certbot: rebuild for Python 3.9

---
 srcpkgs/certbot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 57f05ab66eb..894b4641b9a 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,7 +1,7 @@
 # Template file for 'certbot'
 pkgname=certbot
 version=1.8.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-acme python3-ConfigArgParse python3-configobj

From 7dc6b8c65c4e4f2942c57d1fbfd2a1435f47fd30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:57 -0400
Subject: [PATCH 0446/1118] clearine: rebuild for Python 3.9

---
 srcpkgs/clearine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 539d494b79b..3fad7126c70 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,7 +1,7 @@
 # Template file for 'clearine'
 pkgname=clearine
 version=0.7
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"

From f7ba2b016742e562a409f92fdaef64e1417fd3c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:57 -0400
Subject: [PATCH 0447/1118] collectd: rebuild for Python 3.9

---
 srcpkgs/collectd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index a88454aa4e8..f239ec0d838 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.11.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 112bb6b188b140570f8121759bdce45cd67aaa4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:57 -0400
Subject: [PATCH 0448/1118] compizconfig-python: rebuild for Python 3.9

---
 srcpkgs/compizconfig-python/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template
index 437f1876301..f23f921c3bc 100644
--- a/srcpkgs/compizconfig-python/template
+++ b/srcpkgs/compizconfig-python/template
@@ -1,7 +1,7 @@
 # Template file for 'compizconfig-python'
 pkgname=compizconfig-python
 version=0.8.18
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config glib-devel gettext-devel

From ee43abdd78fefeb8a136f899a90bb980e9b9b1d6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:57 -0400
Subject: [PATCH 0449/1118] configshell-fb: rebuild for Python 3.9

---
 srcpkgs/configshell-fb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/configshell-fb/template b/srcpkgs/configshell-fb/template
index bac43c3a458..77df8c116f8 100644
--- a/srcpkgs/configshell-fb/template
+++ b/srcpkgs/configshell-fb/template
@@ -1,7 +1,7 @@
 # Template file for 'configshell-fb'
 pkgname=configshell-fb
 version=1.1.28
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-six python3-urwid python3-parsing"

From 89d48124d3eec9344026950e747682d0489e3ac4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0450/1118] cozy: rebuild for Python 3.9

---
 srcpkgs/cozy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index b5adfa9fb1d..e6a3bed8e53 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,7 +1,7 @@
 # Template file for 'cozy'
 pkgname=cozy
 version=0.7.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
  python3-mutagen python3-gobject-devel gettext"

From 1ea3bfdb9037bf8202b4c5172647d62c6bdb6d03 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0451/1118] criu: rebuild for Python 3.9

---
 srcpkgs/criu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template
index ea520c900cc..c9f68933e75 100644
--- a/srcpkgs/criu/template
+++ b/srcpkgs/criu/template
@@ -1,7 +1,7 @@
 # Template file for 'criu'
 pkgname=criu
 version=3.14
-revision=2
+revision=3
 # i686 unsupported upstream: https://criu.org/32bit_tasks_C/R#Compatible_applications
 # ppc64 big endian not supported upstream
 archs="x86_64* aarch64* ppc64le* armv7l*"

From e7d480f3f5add8610221635c3e50eb05d83c2647 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0452/1118] cropgui: rebuild for Python 3.9

---
 srcpkgs/cropgui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template
index dcacba5970d..8209209709a 100644
--- a/srcpkgs/cropgui/template
+++ b/srcpkgs/cropgui/template
@@ -1,7 +1,7 @@
 # Template file for 'cropgui'
 pkgname=cropgui
 version=0.4
-revision=3
+revision=4
 hostmakedepends="which python3"
 depends="python3 python3-Pillow python3-gobject
  libjpeg-turbo-tools ImageMagick exiftool"

From 05b43d2c285db6b0bb288975280ae75cf586ec0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0453/1118] cura: rebuild for Python 3.9

---
 srcpkgs/cura/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index dd28bcb1f41..7ebd118bd80 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
 version=4.7.1
-revision=1
+revision=2
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}

From c21394e981a43cf8b6dbf0a0244aae5452c3f05d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0454/1118] diffoscope: rebuild for Python 3.9

---
 srcpkgs/diffoscope/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index b467c65af10..8467f965930 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,7 +1,7 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
 version=160
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-magic python3-libarchive-c python3-setuptools

From 5402e171a2e11dd03a44d04554d1b82a424c29c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0455/1118] distcc: rebuild for Python 3.9

---
 srcpkgs/distcc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 5d5d40a5b5f..31b4f58e84b 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,7 +1,7 @@
 # Template file for 'distcc'
 pkgname=distcc
 version=3.3.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-Werror --with-gtk"
 conf_files="

From b7285a6156faa59cdee477d7110fd71f0e61f8c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0456/1118] docker-compose: rebuild for Python 3.9

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 6e8ff769c6a..c5fcdb65a0a 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=1.27.4
-revision=1
+revision=2
 wrksrc="compose-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cf9e8f2199e66a84be1bea58fefd1118806bb753 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:58 -0400
Subject: [PATCH 0457/1118] duplicity: rebuild for Python 3.9

---
 srcpkgs/duplicity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index 7b4964b759f..6374ad57fbf 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,7 +1,7 @@
 # Template file for 'duplicity'
 pkgname=duplicity
 version=0.8.11.1596
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="duplicity"
 hostmakedepends="gettext python3-setuptools"

From 856c0059b5ff41f65ee7b407b2f3c2a9900f1bd1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0458/1118] eolie: rebuild for Python 3.9

---
 srcpkgs/eolie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 88efc5b89e3..4249e342629 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -1,7 +1,7 @@
 # Template file for 'eolie'
 pkgname=eolie
 version=0.9.62
-revision=2
+revision=3
 _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
 build_style=meson
 pycompile_module="eolie"

From f1a7b1583fe054d1d0032e1ffc0cdbbd08d356d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0459/1118] etesync-dav: rebuild for Python 3.9

---
 srcpkgs/etesync-dav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template
index e2c893fe131..f0fc6cd756d 100644
--- a/srcpkgs/etesync-dav/template
+++ b/srcpkgs/etesync-dav/template
@@ -1,7 +1,7 @@
 # Template file for 'etesync-dav'
 pkgname=etesync-dav
 version=0.20.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-etesync radicale2 python3-Flask python3-Flask-WTF"

From d6b7e82ca9cfb6a06e8b77623e48aba73a4e7717 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0460/1118] fetchmail: rebuild for Python 3.9

---
 srcpkgs/fetchmail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 2a3bc36f99b..8a25628f47c 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,7 +1,7 @@
 # Template file for 'fetchmail'
 pkgname=fetchmail
 version=6.4.12
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="python3"

From e1f56c9b5814dc890589904a8523fa6606c0a930 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0461/1118] fifengine: rebuild for Python 3.9

---
 srcpkgs/fifengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index ca631983149..6a2cc79a448 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
 # Template file for 'fifengine'
 pkgname=fifengine
 version=0.4.2
-revision=5
+revision=6
 build_style=cmake
 pycompile_module="fife"
 hostmakedepends="swig python3"

From 9cda1ef46f7f5d2d2f6040a9025075453dbea21f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0462/1118] fontforge: rebuild for Python 3.9

---
 srcpkgs/fontforge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template
index 30abed5c963..3e97703b4f3 100644
--- a/srcpkgs/fontforge/template
+++ b/srcpkgs/fontforge/template
@@ -1,7 +1,7 @@
 # Template file for 'fontforge'
 pkgname=fontforge
 version=20200314
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4
  pkg-config python3"

From 540226e3068c2ed21c8ecccd6750e2b16ceeedbf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0463/1118] fonttools: rebuild for Python 3.9

---
 srcpkgs/fonttools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index 62579f4f02c..2dd0af782ce 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,7 +1,7 @@
 # Template file for 'fonttools'
 pkgname=fonttools
 version=4.8.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"

From e0790005a72c7d19d81065e873f8f2b8aac83ab1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 20:55:01 -0400
Subject: [PATCH 0464/1118] boost: rebuild for Python 3.9

---
 common/shlibs          | 2 +-
 srcpkgs/boost/template | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e1e729428d3..fae968dbccb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -683,7 +683,7 @@ libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
 libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
 libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
 libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python38.so.1.72.0 boost-python3-1.72-1.72.0_1
+libboost_python39.so.1.72.0 boost-python3-1.72-1.72.0_4
 libexempi.so.8 exempi-2.5.0_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 5412f16a2b2..5b559e932d1 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=3
+revision=4
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
@@ -136,7 +136,6 @@ boost-python3-1.72_package() {
 	}
 }
 boost-build_package() {
-	archs=noarch
 	conf_files="/etc/site-config.jam"
 	short_desc+=" - Boost.Build framework"
 	pkg_install() {

From 62ced0220fa62fefd9e9676310f40314b34ba260 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0465/1118] freecad: rebuild for Python 3.9

---
 srcpkgs/freecad/patches/091-py39.patch | 174 +++++++++++++++++++++++++
 srcpkgs/freecad/template               |   2 +-
 2 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/freecad/patches/091-py39.patch

diff --git a/srcpkgs/freecad/patches/091-py39.patch b/srcpkgs/freecad/patches/091-py39.patch
new file mode 100644
index 00000000000..d03bb03adb2
--- /dev/null
+++ b/srcpkgs/freecad/patches/091-py39.patch
@@ -0,0 +1,174 @@
+Fix for Python 3.9
+
+https://github.com/FreeCAD/FreeCAD/commit/ae641dc5278efafa22b168fc196875558b92e436
+
+diff --git src/Base/swigpyrun_1.3.25.h src/Base/swigpyrun_1.3.25.h
+index 91717210b..9ebadbc83 100644
+--- src/Base/swigpyrun_1.3.25.h
++++ src/Base/swigpyrun_1.3.25.h
+@@ -699,7 +699,11 @@ PySwigObject_type(void) {
+     0,					/*tp_itemsize*/
+     /* methods */
+     (destructor)PySwigObject_dealloc,	/*tp_dealloc*/
++#if PY_VERSION_HEX < 0x03080000
+     (printfunc)PySwigObject_print,	/*tp_print*/
++#else
++    0,          /*tp_vectorcall_offset*/
++#endif
+     (getattrfunc)0,			/*tp_getattr*/
+     (setattrfunc)0,			/*tp_setattr*/
+     (cmpfunc)PySwigObject_compare,	/*tp_compare*/
+@@ -859,7 +863,11 @@ PySwigPacked_type(void) {
+     0,					/*tp_itemsize*/
+     /* methods */
+     (destructor)PySwigPacked_dealloc,	/*tp_dealloc*/
++#if PY_VERSION_HEX < 0x03080000
+     (printfunc)PySwigPacked_print,	/*tp_print*/
++#else
++    0,          /*tp_vectorcall_offset*/
++#endif
+     (getattrfunc)0,			/*tp_getattr*/
+     (setattrfunc)0,			/*tp_setattr*/
+     (cmpfunc)PySwigPacked_compare,	/*tp_compare*/
+diff --git src/Base/swigpyrun_1.3.33.h src/Base/swigpyrun_1.3.33.h
+index f83ac1e89..afd5a8c50 100644
+--- src/Base/swigpyrun_1.3.33.h
++++ src/Base/swigpyrun_1.3.33.h
+@@ -1620,7 +1620,11 @@ _PySwigObject_type(void) {
+ 	sizeof(PySwigObject),		    /* tp_basicsize */
+ 	0,			            /* tp_itemsize */
+ 	(destructor)PySwigObject_dealloc,   /* tp_dealloc */
++#if PY_VERSION_HEX < 0x03080000
+ 	(printfunc)PySwigObject_print,	    /* tp_print */
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
+ #if PY_VERSION_HEX < 0x02020000
+ 	(getattrfunc)PySwigObject_getattr,  /* tp_getattr */ 
+ #else
+@@ -1790,7 +1794,11 @@ _PySwigPacked_type(void) {
+ 	sizeof(PySwigPacked),		    /* tp_basicsize */	
+ 	0,				    /* tp_itemsize */	
+ 	(destructor)PySwigPacked_dealloc,   /* tp_dealloc */	
++#if PY_VERSION_HEX < 0x03080000
+ 	(printfunc)PySwigPacked_print,	    /* tp_print */   	
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
+ 	(getattrfunc)0,			    /* tp_getattr */ 	
+ 	(setattrfunc)0,			    /* tp_setattr */ 	
+ 	(cmpfunc)PySwigPacked_compare,	    /* tp_compare */ 	
+diff --git src/Base/swigpyrun_1.3.36.h src/Base/swigpyrun_1.3.36.h
+index 02c58ad8a..12ad41e12 100644
+--- src/Base/swigpyrun_1.3.36.h
++++ src/Base/swigpyrun_1.3.36.h
+@@ -1628,7 +1628,12 @@ _PySwigObject_type(void) {
+ 	sizeof(PySwigObject),		    /* tp_basicsize */
+ 	0,			            /* tp_itemsize */
+ 	(destructor)PySwigObject_dealloc,   /* tp_dealloc */
++#if PY_VERSION_HEX < 0x03080000
+ 	(printfunc)PySwigObject_print,	    /* tp_print */
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
++
+ #if PY_VERSION_HEX < 0x02020000
+ 	(getattrfunc)PySwigObject_getattr,  /* tp_getattr */ 
+ #else
+@@ -1798,7 +1803,11 @@ _PySwigPacked_type(void) {
+ 	sizeof(PySwigPacked),		    /* tp_basicsize */	
+ 	0,				    /* tp_itemsize */	
+ 	(destructor)PySwigPacked_dealloc,   /* tp_dealloc */	
++#if PY_VERSION_HEX < 0x03080000
+ 	(printfunc)PySwigPacked_print,	    /* tp_print */   	
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
+ 	(getattrfunc)0,			    /* tp_getattr */ 	
+ 	(setattrfunc)0,			    /* tp_setattr */ 	
+ 	(cmpfunc)PySwigPacked_compare,	    /* tp_compare */ 	
+diff --git src/Base/swigpyrun_1.3.38.h src/Base/swigpyrun_1.3.38.h
+index dae058c20..7cacc1579 100644
+--- src/Base/swigpyrun_1.3.38.h
++++ src/Base/swigpyrun_1.3.38.h
+@@ -1741,7 +1741,11 @@ _PySwigObject_type(void) {
+ 	sizeof(SwigPyObject),		    /* tp_basicsize */
+ 	0,			            /* tp_itemsize */
+ 	(destructor)SwigPyObject_dealloc,   /* tp_dealloc */
++#if PY_VERSION_HEX < 0x03080000
+ 	(printfunc)SwigPyObject_print,	    /* tp_print */
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
+ #if PY_VERSION_HEX < 0x02020000
+ 	(getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
+ #else
+@@ -1919,7 +1923,11 @@ _PySwigPacked_type(void) {
+ 	sizeof(SwigPyPacked),		    /* tp_basicsize */	
+ 	0,				    /* tp_itemsize */	
+ 	(destructor)SwigPyPacked_dealloc,   /* tp_dealloc */	
++#if PY_VERSION_HEX < 0x03080000
+ 	(printfunc)SwigPyPacked_print,	    /* tp_print */   	
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
+ 	(getattrfunc)0,			    /* tp_getattr */ 	
+ 	(setattrfunc)0,			    /* tp_setattr */ 	
+ 	(cmpfunc)SwigPyPacked_compare,	    /* tp_compare */ 	
+diff --git src/Base/swigpyrun_1.3.40.h src/Base/swigpyrun_1.3.40.h
+index 136ba809f..400db8b47 100644
+--- src/Base/swigpyrun_1.3.40.h
++++ src/Base/swigpyrun_1.3.40.h
+@@ -1766,7 +1766,11 @@ _PySwigObject_type(void) {
+ 	sizeof(SwigPyObject),		    /* tp_basicsize */
+ 	0,			            /* tp_itemsize */
+ 	(destructor)SwigPyObject_dealloc,   /* tp_dealloc */
++#if PY_VERSION_HEX < 0x03080000
+ 	(printfunc)SwigPyObject_print,	    /* tp_print */
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
+ #if PY_VERSION_HEX < 0x02020000
+ 	(getattrfunc)SwigPyObject_getattr,  /* tp_getattr */ 
+ #else
+@@ -1947,8 +1951,12 @@ _PySwigPacked_type(void) {
+ 	(char *)"SwigPyPacked",		    /* tp_name */	
+ 	sizeof(SwigPyPacked),		    /* tp_basicsize */	
+ 	0,				    /* tp_itemsize */	
+-	(destructor)SwigPyPacked_dealloc,   /* tp_dealloc */	
+-	(printfunc)SwigPyPacked_print,	    /* tp_print */   	
++	(destructor)SwigPyPacked_dealloc,   /* tp_dealloc */
++#if PY_VERSION_HEX < 0x03080000
++	(printfunc)SwigPyPacked_print,	    /* tp_print */
++#else
++	0, /*tp_vectorcall_offset*/
++#endif
+ 	(getattrfunc)0,			    /* tp_getattr */ 	
+ 	(setattrfunc)0,			    /* tp_setattr */ 	
+ #if PY_VERSION_HEX>=0x03000000
+diff --git src/CXX/Python3/cxx_extensions.cxx src/CXX/Python3/cxx_extensions.cxx
+index fb3da455f..9ff94612f 100644
+--- src/CXX/Python3/cxx_extensions.cxx
++++ src/CXX/Python3/cxx_extensions.cxx
+@@ -381,7 +381,11 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam
+ 
+     // Methods to implement standard operations
+     table->tp_dealloc = (destructor)standard_dealloc;
++#if PY_VERSION_HEX < 0x03080000
+     table->tp_print = 0;
++#else
++    table->tp_vectorcall_offset = 0;
++#endif
+     table->tp_getattr = 0;
+     table->tp_setattr = 0;
+     table->tp_repr = 0;
+@@ -524,7 +528,9 @@ PythonType &PythonType::supportClass()
+ #ifdef PYCXX_PYTHON_2TO3
+ PythonType &PythonType::supportPrint()
+ {
++#if PY_VERSION_HEX < 0x03080000
+     table->tp_print = print_handler;
++#endif
+     return *this;
+ }
+ #endif
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 8a36d1a38e4..76d6df64724 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.18.4
-revision=8
+revision=9
 wrksrc="FreeCAD-${version}"
 build_style=cmake
 

From 61eae43fe33b102e464d6c4fac6e33cf9a66f1a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:54:59 -0400
Subject: [PATCH 0466/1118] freeorion: rebuild for Python 3.9

---
 srcpkgs/freeorion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index e4882a739fd..37bfc09176c 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
 # Template file for 'freeorion'
 pkgname=freeorion
 version=0.4.10
-revision=1
+revision=2
 _release=${version}_2020-07-10.f3d403e
 wrksrc=src-tarball
 build_style=cmake

From 35961acbec98390d0e410db92a8d794fd941cfe7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0467/1118] frr: rebuild for Python 3.9

---
 srcpkgs/frr/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 49a03c73a2b..5becfd4672e 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
 # Template file for 'frr'
 pkgname=frr
 version=7.4
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 # chroot-texinfo is not able to build frr's docs
@@ -41,6 +41,11 @@ else
 	subpackages+=" frr-devel"
 fi
 
+post_patch() {
+	# Typo in configure macro
+	vsed -i m4/ax_python.m4 -e 's/"{py_ver}"/"${py_ver}"/g'
+}
+
 pre_configure() {
 	autoreconf -fi
 }

From 8b020d0aaf5789923d64971fb85006f314c81b85 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0468/1118] gajim: rebuild for Python 3.9

---
 srcpkgs/gajim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index be4c2ed48cb..0c99528981c 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,7 +1,7 @@
 # Template file for 'gajim'
 pkgname=gajim
 version=1.2.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools

From 7821e138ca7b09a647fa8f37b27f907ffffd2590 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0469/1118] gajim-omemo: rebuild for Python 3.9

---
 srcpkgs/gajim-omemo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gajim-omemo/template b/srcpkgs/gajim-omemo/template
index 09d37c5efd8..320d6c9da93 100644
--- a/srcpkgs/gajim-omemo/template
+++ b/srcpkgs/gajim-omemo/template
@@ -1,7 +1,7 @@
 # Template file for 'gajim-omemo'
 pkgname=gajim-omemo
 version=2.6.80
-revision=1
+revision=2
 wrksrc="omemo"
 hostmakedepends="unzip"
 depends="python3 python3-setuptools python3-cryptography python3-axolotl python3-qrcode"

From 05025868b9cb03618d2ecb9778d4bca5c2d4e892 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0470/1118] gammastep: rebuild for Python 3.9

---
 srcpkgs/gammastep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template
index c6a7b1376ca..5cdfe5048eb 100644
--- a/srcpkgs/gammastep/template
+++ b/srcpkgs/gammastep/template
@@ -1,7 +1,7 @@
 # Template file for 'gammastep'
 pkgname=gammastep
 version=2.0.2
-revision=1
+revision=2
 wrksrc="${pkgname}-v$version"
 build_style=gnu-configure
 configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr

From 68b0a66a1798965ca8ac22dcc5e4a9b1e192cded Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0471/1118] gdb: rebuild for Python 3.9

---
 srcpkgs/gdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 7cbad76b062..aad3abd497e 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=9.2
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline

From d318f59ef10a49186ef3a577b211d98959046fdc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0472/1118] gdown: rebuild for Python 3.9

---
 srcpkgs/gdown/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template
index 94c3593cb63..e855fef80ca 100644
--- a/srcpkgs/gdown/template
+++ b/srcpkgs/gdown/template
@@ -1,7 +1,7 @@
 # Template file for 'gdown'
 pkgname=gdown
 version=3.12.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="python3-filelock python3-requests python3-six python3-tqdm

From ee608fde2140b7a12556f4584bf85a55adb94038 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0473/1118] gedit: rebuild for Python 3.9

---
 srcpkgs/gedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index dc2de8b4c48..efce069ed85 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,7 +1,7 @@
 # Template file for 'gedit'
 pkgname=gedit
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 pycompile_dirs="usr/lib/gedit/plugins"

From db7acf306c3c33e5b134760d4312c0c3070a0cd8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:00 -0400
Subject: [PATCH 0474/1118] geis: rebuild for Python 3.9

---
 srcpkgs/geis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template
index 3c21b143848..e31cd8bc785 100644
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@@ -1,7 +1,7 @@
 # Template file for 'geis'
 pkgname=geis
 version=2.2.17
-revision=6
+revision=7
 hostmakedepends="pkg-config python3-devel"
 makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
 build_style="gnu-configure"

From b1018a85d915af0c182ecc361cb22b7f244c12c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0475/1118] gitg: rebuild for Python 3.9

---
 srcpkgs/gitg/patches/vapi.patch | 8594 +++++++++++++++++++++++++++++++
 srcpkgs/gitg/template           |    2 +-
 2 files changed, 8595 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gitg/patches/vapi.patch

diff --git a/srcpkgs/gitg/patches/vapi.patch b/srcpkgs/gitg/patches/vapi.patch
new file mode 100644
index 00000000000..5fb234b453d
--- /dev/null
+++ b/srcpkgs/gitg/patches/vapi.patch
@@ -0,0 +1,8594 @@
+From fe4a8bf205bc4a1f2753ccf83f0946d5ef55202e Mon Sep 17 00:00:00 2001
+From: Alberto Fanjul <albertofanjul@gmail.com>
+Date: Wed, 7 Aug 2019 00:41:56 +0200
+Subject: [PATCH] vala: Remove obsolete vapi files
+
+---
+ vapi/gio-windows-2.0.vapi   |   21 -
+ vapi/glib-2.0.vapi          | 6173 -----------------------------------
+ vapi/gtksourceview-3.0.deps |    7 -
+ vapi/gtksourceview-3.0.vapi |  937 ------
+ vapi/libsoup-2.4.deps       |    1 -
+ vapi/libsoup-2.4.vapi       | 1396 --------
+ 6 files changed, 8535 deletions(-)
+ delete mode 100644 vapi/gio-windows-2.0.vapi
+ delete mode 100644 vapi/glib-2.0.vapi
+ delete mode 100644 vapi/gtksourceview-3.0.deps
+ delete mode 100644 vapi/gtksourceview-3.0.vapi
+ delete mode 100644 vapi/libsoup-2.4.deps
+ delete mode 100644 vapi/libsoup-2.4.vapi
+
+diff --git a/vapi/gio-windows-2.0.vapi b/vapi/gio-windows-2.0.vapi
+deleted file mode 100644
+index 39c9da28..00000000
+--- vapi/gio-windows-2.0.vapi
++++ /dev/null
+@@ -1,21 +0,0 @@
+-[CCode (cprefix = "G", lower_case_cprefix = "g_")]
+-namespace GLib {
+-	[CCode (cheader_filename = "gio/gwin32inputstream.h")]
+-	public class Win32InputStream : GLib.InputStream {
+-		[CCode (has_construct_function = false, type = "GInputStream*")]
+-		public Win32InputStream (int handle, bool close_fd);
+-		public bool get_close_handle ();
+-		public void set_close_handle (bool close_fd);
+-		public bool close_handle { get; set; }
+-		public int handle { get; construct; }
+-	}
+-	[CCode (cheader_filename = "gio/gwin32outputstream.h")]
+-	public class Win32OutputStream : GLib.OutputStream {
+-		[CCode (has_construct_function = false, type = "GOutputStream*")]
+-		public Win32OutputStream (int handle, bool close_fd);
+-		public bool get_close_handle ();
+-		public void set_close_handle (bool close_fd);
+-		public bool close_handle { get; set; }
+-		public int handle { get; construct; }
+-	}
+-}
+diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
+deleted file mode 100644
+index 37de9592..00000000
+--- vapi/glib-2.0.vapi
++++ /dev/null
+@@ -1,6173 +0,0 @@
+-/* glib-2.0.vala
+- *
+- * Copyright (C) 2006-2014  Jürg Billeter
+- * Copyright (C) 2006-2008  Raffaele Sandrini
+- * Copyright (C) 2007  Mathias Hasselmann
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2.1 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+- *
+- * As a special exception, if you use inline functions from this file, this
+- * file does not by itself cause the resulting executable to be covered by
+- * the GNU Lesser General Public License.
+- *
+- * Author:
+- * 	Jürg Billeter <j@bitron.ch>
+- *	Raffaele Sandrini <rasa@gmx.ch>
+- *	Mathias Hasselmann <mathias.hasselmann@gmx.de>
+- */
+-
+-//FIXME: This file is added to include fixes in glib-2.0.vapi that should be released on vala 0.43.3. Remove then.
+-
+-[SimpleType]
+-[GIR (name = "gboolean")]
+-[CCode (cname = "gboolean", cheader_filename = "glib.h", type_id = "G_TYPE_BOOLEAN", marshaller_type_name = "BOOLEAN", get_value_function = "g_value_get_boolean", set_value_function = "g_value_set_boolean", default_value = "FALSE", type_signature = "b")]
+-[BooleanType]
+-public struct bool {
+-	public string to_string () {
+-		if (this) {
+-			return "true";
+-		} else {
+-			return "false";
+-		}
+-	}
+-
+-	public static bool parse (string str) {
+-		if (str == "true") {
+-			return true;
+-		} else {
+-			return false;
+-		}
+-	}
+-	public static bool try_parse (string str, out bool result = null) {
+-		if (str == "true") {
+-			result = true;
+-			return true;
+-		} else if (str == "false") {
+-			result = false;
+-			return true;
+-		} else {
+-			result = false;
+-			return false;
+-		}
+-	}
+-}
+-
+-[SimpleType]
+-[GIR (name = "gint8")]
+-[CCode (cname = "gchar", cprefix = "g_ascii_", cheader_filename = "glib.h", type_id = "G_TYPE_CHAR", marshaller_type_name = "CHAR", get_value_function = "g_value_get_schar", set_value_function = "g_value_set_schar", default_value = "\'\\0\'", type_signature = "y")]
+-[IntegerType (rank = 2, min = 0, max = 127)]
+-public struct char {
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%c");
+-	public bool isalnum ();
+-	public bool isalpha ();
+-	public bool iscntrl ();
+-	public bool isdigit ();
+-	public bool isgraph ();
+-	public bool islower ();
+-	public bool isprint ();
+-	public bool ispunct ();
+-	public bool isspace ();
+-	public bool isupper ();
+-	public bool isxdigit ();
+-	public int digit_value ();
+-	public int xdigit_value ();
+-	public char tolower ();
+-	public char toupper ();
+-
+-	[CCode (cname = "MIN")]
+-	public static char min (char a, char b);
+-	[CCode (cname = "MAX")]
+-	public static char max (char a, char b);
+-	[CCode (cname = "CLAMP")]
+-	public char clamp (char low, char high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "guint8")]
+-[CCode (cname = "guchar", cheader_filename = "glib.h", type_id = "G_TYPE_UCHAR", marshaller_type_name = "UCHAR", get_value_function = "g_value_get_uchar", set_value_function = "g_value_set_uchar", default_value = "\'\\0\'", type_signature = "y")]
+-[IntegerType (rank = 3, min = 0, max = 255)]
+-public struct uchar {
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%hhu");
+-
+-	[CCode (cname = "MIN")]
+-	public static uchar min (uchar a, uchar b);
+-	[CCode (cname = "MAX")]
+-	public static uchar max (uchar a, uchar b);
+-	[CCode (cname = "CLAMP")]
+-	public uchar clamp (uchar low, uchar high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "gint")]
+-[CCode (cname = "gint", cheader_filename = "glib.h", type_id = "G_TYPE_INT", marshaller_type_name = "INT", get_value_function = "g_value_get_int", set_value_function = "g_value_set_int", default_value = "0", default_value_on_error = "-1", type_signature = "i")]
+-[IntegerType (rank = 6)]
+-public struct int {
+-	[CCode (cname = "G_MININT")]
+-	public const int MIN;
+-	[CCode (cname = "G_MAXINT")]
+-	public const int MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%i");
+-
+-	[CCode (cname = "MIN")]
+-	public static int min (int a, int b);
+-	[CCode (cname = "MAX")]
+-	public static int max (int a, int b);
+-	[CCode (cname = "CLAMP")]
+-	public int clamp (int low, int high);
+-
+-	[CCode (cname = "GINT_TO_POINTER")]
+-	public void* to_pointer ();
+-	[CCode (cname = "GPOINTER_TO_INT")]
+-	public static int from_pointer (void* p);
+-
+-	[CCode (cname = "abs", cheader_filename = "stdlib.h")]
+-	public int abs ();
+-
+-	[CCode (cname = "GINT_TO_BE")]
+-	public int to_big_endian ();
+-	[CCode (cname = "GINT_TO_LE")]
+-	public int to_little_endian ();
+-
+-	[CCode (cname = "GINT_FROM_BE")]
+-	public static int from_big_endian (int val);
+-	[CCode (cname = "GINT_FROM_LE")]
+-	public static int from_little_endian (int val);
+-
+-	[CCode (cname = "atoi", cheader_filename = "stdlib.h")]
+-	public static int parse (string str);
+-}
+-
+-[SimpleType]
+-[GIR (name = "guint")]
+-[CCode (cname = "guint", cheader_filename = "glib.h", type_id = "G_TYPE_UINT", marshaller_type_name = "UINT", get_value_function = "g_value_get_uint", set_value_function = "g_value_set_uint", default_value = "0U", type_signature = "u")]
+-[IntegerType (rank = 7)]
+-public struct uint {
+-	[CCode (cname = "0")]
+-	public const uint MIN;
+-	[CCode (cname = "G_MAXUINT")]
+-	public const uint MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%u");
+-
+-	[CCode (cname = "MIN")]
+-	public static uint min (uint a, uint b);
+-	[CCode (cname = "MAX")]
+-	public static uint max (uint a, uint b);
+-	[CCode (cname = "CLAMP")]
+-	public uint clamp (uint low, uint high);
+-
+-	[CCode (cname = "GUINT_TO_POINTER")]
+-	public void* to_pointer ();
+-	[CCode (cname = "GPOINTER_TO_UINT")]
+-	public static uint from_pointer (void* p);
+-
+-	[CCode (cname = "GUINT_TO_BE")]
+-	public uint to_big_endian ();
+-	[CCode (cname = "GUINT_TO_LE")]
+-	public uint to_little_endian ();
+-
+-	[CCode (cname = "GUINT_FROM_BE")]
+-	public static uint from_big_endian (uint val);
+-	[CCode (cname = "GUINT_FROM_LE")]
+-	public static uint from_little_endian (uint val);
+-}
+-
+-[SimpleType]
+-[GIR (name = "gshort")]
+-[CCode (cname = "gshort", cheader_filename = "glib.h", type_id = "G_TYPE_INT", marshaller_type_name = "INT", get_value_function = "g_value_get_int", set_value_function = "g_value_set_int", default_value = "0", default_value_on_error = "-1", type_signature = "n")]
+-[IntegerType (rank = 4, min = -32768, max = 32767)]
+-public struct short {
+-	[CCode (cname = "G_MINSHORT")]
+-	public const short MIN;
+-	[CCode (cname = "G_MAXSHORT")]
+-	public const short MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%hi");
+-
+-	[CCode (cname = "MIN")]
+-	public static short min (short a, short b);
+-	[CCode (cname = "MAX")]
+-	public static short max (short a, short b);
+-	[CCode (cname = "CLAMP")]
+-	public short clamp (short low, short high);
+-	[CCode (cname = "abs", cheader_filename = "stdlib.h")]
+-	public short abs ();
+-}
+-
+-[SimpleType]
+-[GIR (name = "gushort")]
+-[CCode (cname = "gushort", cheader_filename = "glib.h", type_id = "G_TYPE_UINT", marshaller_type_name = "UINT", get_value_function = "g_value_get_uint", set_value_function = "g_value_set_uint", default_value = "0U", type_signature = "q")]
+-[IntegerType (rank = 5, min = 0, max = 65535)]
+-public struct ushort {
+-	[CCode (cname = "0U")]
+-	public const ushort MIN;
+-	[CCode (cname = "G_MAXUSHORT")]
+-	public const ushort MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%hu");
+-
+-	[CCode (cname = "MIN")]
+-	public static ushort min (ushort a, ushort b);
+-	[CCode (cname = "MAX")]
+-	public static ushort max (ushort a, ushort b);
+-	[CCode (cname = "CLAMP")]
+-	public ushort clamp (ushort low, ushort high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "glong")]
+-[CCode (cname = "glong", cheader_filename = "glib.h", type_id = "G_TYPE_LONG", marshaller_type_name = "LONG", get_value_function = "g_value_get_long", set_value_function = "g_value_set_long", default_value = "0L", default_value_on_error = "-1L")]
+-[IntegerType (rank = 8)]
+-public struct long {
+-	[CCode (cname = "G_MINLONG")]
+-	public const long MIN;
+-	[CCode (cname = "G_MAXLONG")]
+-	public const long MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%li");
+-
+-	[CCode (cname = "MIN")]
+-	public static long min (long a, long b);
+-	[CCode (cname = "MAX")]
+-	public static long max (long a, long b);
+-	[CCode (cname = "CLAMP")]
+-	public long clamp (long low, long high);
+-	[CCode (cname = "labs", cheader_filename = "stdlib.h")]
+-	public long abs ();
+-
+-	[CCode (cname = "GLONG_TO_BE")]
+-	public long to_big_endian ();
+-	[CCode (cname = "GLONG_TO_LE")]
+-	public long to_little_endian ();
+-
+-	[CCode (cname = "GLONG_FROM_BE")]
+-	public static long from_big_endian (long val);
+-	[CCode (cname = "GLONG_FROM_LE")]
+-	public static long from_little_endian (long val);
+-
+-	[CCode (cname = "strtol", cheader_filename = "stdlib.h")]
+-	static long strtol (string nptr, out char* endptr, uint _base);
+-
+-	public static long parse (string str) {
+-		return strtol (str, null, 0);
+-	}
+-
+-	public static bool try_parse (string str, out long result = null, out unowned string unparsed = null) {
+-		char* endptr;
+-		result = strtol (str, out endptr, 0);
+-		if (endptr == (char*) str + str.length) {
+-			unparsed = "";
+-			return true;
+-		} else {
+-			unparsed = (string) endptr;
+-			return false;
+-		}
+-	}
+-}
+-
+-[SimpleType]
+-[GIR (name = "gulong")]
+-[CCode (cname = "gulong", cheader_filename = "glib.h", type_id = "G_TYPE_ULONG", marshaller_type_name = "ULONG", get_value_function = "g_value_get_ulong", set_value_function = "g_value_set_ulong", default_value = "0UL")]
+-[IntegerType (rank = 9)]
+-public struct ulong {
+-	[CCode (cname = "0UL")]
+-	public const ulong MIN;
+-	[CCode (cname = "G_MAXULONG")]
+-	public const ulong MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%lu");
+-
+-	[CCode (cname = "MIN")]
+-	public static ulong min (ulong a, ulong b);
+-	[CCode (cname = "MAX")]
+-	public static ulong max (ulong a, ulong b);
+-	[CCode (cname = "CLAMP")]
+-	public ulong clamp (ulong low, ulong high);
+-
+-	[CCode (cname = "GULONG_TO_BE")]
+-	public ulong to_big_endian ();
+-	[CCode (cname = "GULONG_TO_LE")]
+-	public ulong to_little_endian ();
+-
+-	[CCode (cname = "GULONG_FROM_BE")]
+-	public static ulong from_big_endian (ulong val);
+-	[CCode (cname = "GULONG_FROM_LE")]
+-	public static ulong from_little_endian (ulong val);
+-
+-	[CCode (cname = "strtoul", cheader_filename = "stdlib.h")]
+-	static ulong strtoul (string nptr, out char* endptr, uint _base);
+-
+-	public static ulong parse (string str) {
+-		return strtoul (str, null, 0);
+-	}
+-
+-	public static bool try_parse (string str, out ulong result = null, out unowned string unparsed = null) {
+-		char* endptr;
+-		result = strtoul (str, out endptr, 0);
+-		if (endptr == (char*) str + str.length) {
+-			unparsed = "";
+-			return true;
+-		} else {
+-			unparsed = (string) endptr;
+-			return false;
+-		}
+-	}
+-}
+-
+-[SimpleType]
+-[GIR (name = "gulong")]
+-[CCode (cname = "gsize", cheader_filename = "glib.h", type_id = "G_TYPE_ULONG", marshaller_type_name = "ULONG", get_value_function = "g_value_get_ulong", set_value_function = "g_value_set_ulong", default_value = "0UL")]
+-[IntegerType (rank = 9)]
+-public struct size_t {
+-	[CCode (cname = "0UL")]
+-	public const ulong MIN;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MAXSIZE")]
+-	public const ulong MAX;
+-
+-	[Version (since = "2.6")]
+-	[CCode (cname = "G_GSIZE_FORMAT")]
+-	public const string FORMAT;
+-	[Version (since = "2.6")]
+-	[CCode (cname = "G_GSIZE_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%" + FORMAT);
+-
+-	[CCode (cname = "GSIZE_TO_POINTER")]
+-	public void* to_pointer ();
+-	[CCode (cname = "GPOINTER_TO_SIZE")]
+-	public static size_t from_pointer (void* p);
+-
+-	[CCode (cname = "MIN")]
+-	public static size_t min (size_t a, size_t b);
+-	[CCode (cname = "MAX")]
+-	public static size_t max (size_t a, size_t b);
+-	[CCode (cname = "CLAMP")]
+-	public size_t clamp (size_t low, size_t high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "glong")]
+-[CCode (cname = "gssize", cheader_filename = "glib.h", type_id = "G_TYPE_LONG", marshaller_type_name = "LONG", get_value_function = "g_value_get_long", set_value_function = "g_value_set_long", default_value = "0L", default_value_on_error = "-1L")]
+-[IntegerType (rank = 8)]
+-public struct ssize_t {
+-	[Version (since = "2.14")]
+-	[CCode (cname = "G_MINSSIZE")]
+-	public const long MIN;
+-	[Version (since = "2.14")]
+-	[CCode (cname = "G_MAXSSIZE")]
+-	public const long MAX;
+-
+-	[Version (since = "2.6")]
+-	[CCode (cname = "G_GSSIZE_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GSIZE_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%" + FORMAT);
+-
+-	[CCode (cname = "MIN")]
+-	public static ssize_t min (ssize_t a, ssize_t b);
+-	[CCode (cname = "MAX")]
+-	public static ssize_t max (ssize_t a, ssize_t b);
+-	[CCode (cname = "CLAMP")]
+-	public ssize_t clamp (ssize_t low, ssize_t high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "gulong")]
+-[CCode (cname = "guintptr", cheader_filename = "glib.h", type_id = "G_TYPE_ULONG", marshaller_type_name = "ULONG", get_value_function = "g_value_get_ulong", set_value_function = "g_value_set_ulong", default_value = "0UL")]
+-[IntegerType (rank = 9)]
+-public struct uintptr {
+-	[CCode (cname = "0UL")]
+-	public const ulong MIN;
+-	[CCode (cname = "G_MAXSIZE")]
+-	public const ulong MAX;
+-
+-	[CCode (cname = "G_GUINTPTR_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GINTPTR_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%" + FORMAT);
+-
+-	[CCode (cname = "GSIZE_TO_POINTER")]
+-	public void* to_pointer ();
+-	[CCode (cname = "GPOINTER_TO_SIZE")]
+-	public static uintptr from_pointer (void* p);
+-
+-	[CCode (cname = "MIN")]
+-	public static uintptr min (uintptr a, uintptr b);
+-	[CCode (cname = "MAX")]
+-	public static uintptr max (uintptr a, uintptr b);
+-	[CCode (cname = "CLAMP")]
+-	public uintptr clamp (uintptr low, uintptr high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "glong")]
+-[CCode (cname = "gintptr", cheader_filename = "glib.h", type_id = "G_TYPE_LONG", marshaller_type_name = "LONG", get_value_function = "g_value_get_long", set_value_function = "g_value_set_long", default_value = "0L")]
+-[IntegerType (rank = 8)]
+-public struct intptr {
+-	[CCode (cname = "G_MINSSIZE")]
+-	public const long MIN;
+-	[CCode (cname = "G_MAXSSIZE")]
+-	public const long MAX;
+-
+-	[CCode (cname = "G_GINTPTR_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GINTPTR_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%" + FORMAT);
+-
+-	[CCode (cname = "MIN")]
+-	public static intptr min (intptr a, intptr b);
+-	[CCode (cname = "MAX")]
+-	public static intptr max (intptr a, intptr b);
+-	[CCode (cname = "CLAMP")]
+-	public intptr clamp (intptr low, intptr high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "gint8")]
+-[CCode (cname = "gint8", cheader_filename = "glib.h", type_id = "G_TYPE_CHAR", marshaller_type_name = "CHAR", get_value_function = "g_value_get_char", set_value_function = "g_value_set_char", default_value = "0", default_value_on_error = "-1", type_signature = "y")]
+-[IntegerType (rank = 1, min = -128, max = 127)]
+-public struct int8 {
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MININT8")]
+-	public const int8 MIN;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MAXINT8")]
+-	public const int8 MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%hhi");
+-
+-	[CCode (cname = "MIN")]
+-	public static int8 min (int8 a, int8 b);
+-	[CCode (cname = "MAX")]
+-	public static int8 max (int8 a, int8 b);
+-	[CCode (cname = "CLAMP")]
+-	public int8 clamp (int8 low, int8 high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "guint8")]
+-[CCode (cname = "guint8", cheader_filename = "glib.h", type_id = "G_TYPE_UCHAR", marshaller_type_name = "UCHAR", get_value_function = "g_value_get_uchar", set_value_function = "g_value_set_uchar", default_value = "0U", type_signature = "y")]
+-[IntegerType (rank = 3, min = 0, max = 255)]
+-public struct uint8 {
+-	[CCode (cname = "0U")]
+-	public const uint8 MIN;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MAXUINT8")]
+-	public const uint8 MAX;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%hhu");
+-
+-	[CCode (cname = "MIN")]
+-	public static uint8 min (uint8 a, uint8 b);
+-	[CCode (cname = "MAX")]
+-	public static uint8 max (uint8 a, uint8 b);
+-	[CCode (cname = "CLAMP")]
+-	public uint8 clamp (uint8 low, uint8 high);
+-}
+-
+-[SimpleType]
+-[GIR (name = "gint16")]
+-[CCode (cname = "gint16", cheader_filename = "glib.h", type_id = "G_TYPE_INT", marshaller_type_name = "INT", get_value_function = "g_value_get_int", set_value_function = "g_value_set_int", default_value = "0", default_value_on_error = "-1", type_signature = "n")]
+-[IntegerType (rank = 4, min = -32768, max = 32767)]
+-public struct int16 {
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MININT16")]
+-	public const int16 MIN;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MAXINT16")]
+-	public const int16 MAX;
+-
+-	[CCode (cname = "G_GINT16_FORMAT")]
+-	public const string FORMAT;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_GINT16_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%" + FORMAT);
+-
+-	[CCode (cname = "MIN")]
+-	public static int16 min (int16 a, int16 b);
+-	[CCode (cname = "MAX")]
+-	public static int16 max (int16 a, int16 b);
+-	[CCode (cname = "CLAMP")]
+-	public int16 clamp (int16 low, int16 high);
+-
+-	[CCode (cname = "GINT16_TO_BE")]
+-	public int16 to_big_endian ();
+-	[CCode (cname = "GINT16_TO_LE")]
+-	public int16 to_little_endian ();
+-
+-	[CCode (cname = "GINT16_FROM_BE")]
+-	public static int16 from_big_endian (int16 val);
+-	[CCode (cname = "GINT16_FROM_LE")]
+-	public static int16 from_little_endian (int16 val);
+-}
+-
+-[SimpleType]
+-[GIR (name = "guint16")]
+-[CCode (cname = "guint16", cheader_filename = "glib.h", type_id = "G_TYPE_UINT", marshaller_type_name = "UINT", get_value_function = "g_value_get_uint", set_value_function = "g_value_set_uint", default_value = "0U", type_signature = "q")]
+-[IntegerType (rank = 5, min = 0, max = 65535)]
+-public struct uint16 {
+-	[CCode (cname = "0U")]
+-	public const uint16 MIN;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MAXUINT16")]
+-	public const uint16 MAX;
+-
+-	[CCode (cname = "G_GUINT16_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GINT16_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%hu");
+-
+-	[CCode (cname = "MIN")]
+-	public static uint16 min (uint16 a, uint16 b);
+-	[CCode (cname = "MAX")]
+-	public static uint16 max (uint16 a, uint16 b);
+-	[CCode (cname = "CLAMP")]
+-	public uint16 clamp (uint16 low, uint16 high);
+-
+-	[CCode (cname = "GUINT16_TO_BE")]
+-	public uint16 to_big_endian ();
+-	[CCode (cname = "GUINT16_TO_LE")]
+-	public uint16 to_little_endian ();
+-
+-	[CCode (cname = "GUINT16_FROM_BE")]
+-	public static uint16 from_big_endian (uint16 val);
+-	[CCode (cname = "GUINT16_FROM_LE")]
+-	public static uint16 from_little_endian (uint16 val);
+-
+-	[CCode (cname = "g_htons")]
+-	public static uint16 to_network (uint16 val);
+-	[CCode (cname = "g_ntohs")]
+-	public static uint16 from_network (uint16 val);
+-
+-	[CCode (cname = "GUINT16_SWAP_BE_PDP")]
+-	public uint16 swap_big_endian_pdp ();
+-	[CCode (cname = "GUINT16_SWAP_LE_BE")]
+-	public uint16 swap_little_endian_big_endian ();
+-	[CCode (cname = "GUINT16_SWAP_LE_PDP")]
+-	public uint16 swap_little_endian_pdp ();
+-}
+-
+-[SimpleType]
+-[GIR (name = "gint32")]
+-[CCode (cname = "gint32", cheader_filename = "glib.h", type_id = "G_TYPE_INT", marshaller_type_name = "INT", get_value_function = "g_value_get_int", set_value_function = "g_value_set_int", default_value = "0", default_value_on_error = "-1", type_signature = "i")]
+-[IntegerType (rank = 6)]
+-public struct int32 {
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MININT32")]
+-	public const int32 MIN;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MAXINT32")]
+-	public const int32 MAX;
+-
+-	[CCode (cname = "G_GINT32_FORMAT")]
+-	public const string FORMAT;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_GINT32_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%i");
+-
+-	[CCode (cname = "MIN")]
+-	public static int32 min (int32 a, int32 b);
+-	[CCode (cname = "MAX")]
+-	public static int32 max (int32 a, int32 b);
+-	[CCode (cname = "CLAMP")]
+-	public int32 clamp (int32 low, int32 high);
+-
+-	[CCode (cname = "GINT32_TO_BE")]
+-	public int32 to_big_endian ();
+-	[CCode (cname = "GINT32_TO_LE")]
+-	public int32 to_little_endian ();
+-
+-	[CCode (cname = "GINT32_FROM_BE")]
+-	public static int32 from_big_endian (int32 val);
+-	[CCode (cname = "GINT32_FROM_LE")]
+-	public static int32 from_little_endian (int32 val);
+-}
+-
+-[SimpleType]
+-[GIR (name = "guint32")]
+-[CCode (cname = "guint32", cheader_filename = "glib.h", type_id = "G_TYPE_UINT", marshaller_type_name = "UINT", get_value_function = "g_value_get_uint", set_value_function = "g_value_set_uint", default_value = "0U", type_signature = "u")]
+-[IntegerType (rank = 7)]
+-public struct uint32 {
+-	[CCode (cname = "0U")]
+-	public const uint32 MIN;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_MAXUINT32")]
+-	public const uint32 MAX;
+-
+-	[CCode (cname = "G_GUINT32_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GINT32_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%u");
+-
+-	[CCode (cname = "MIN")]
+-	public static uint32 min (uint32 a, uint32 b);
+-	[CCode (cname = "MAX")]
+-	public static uint32 max (uint32 a, uint32 b);
+-	[CCode (cname = "CLAMP")]
+-	public uint32 clamp (uint32 low, uint32 high);
+-
+-	[CCode (cname = "GUINT32_TO_BE")]
+-	public uint32 to_big_endian ();
+-	[CCode (cname = "GUINT32_TO_LE")]
+-	public uint32 to_little_endian ();
+-
+-	[CCode (cname = "GUINT32_FROM_BE")]
+-	public static uint32 from_big_endian (uint32 val);
+-	[CCode (cname = "GUINT32_FROM_LE")]
+-	public static uint32 from_little_endian (uint32 val);
+-
+-	[CCode (cname = "g_htonl")]
+-	public static uint32 to_network (uint32 val);
+-	[CCode (cname = "g_ntohl")]
+-	public static uint32 from_network (uint32 val);
+-
+-	[CCode (cname = "GUINT32_SWAP_BE_PDP")]
+-	public uint32 swap_big_endian_pdp ();
+-	[CCode (cname = "GUINT32_SWAP_LE_BE")]
+-	public uint32 swap_little_endian_big_endian ();
+-	[CCode (cname = "GUINT32_SWAP_LE_PDP")]
+-	public uint32 swap_little_endian_pdp ();
+-}
+-
+-[SimpleType]
+-[GIR (name = "gint64")]
+-[CCode (cname = "gint64", cheader_filename = "glib.h", type_id = "G_TYPE_INT64", marshaller_type_name = "INT64", get_value_function = "g_value_get_int64", set_value_function = "g_value_set_int64", default_value = "0LL", default_value_on_error = "-1LL", type_signature = "x")]
+-[IntegerType (rank = 10)]
+-public struct int64 {
+-	[CCode (cname = "G_MININT64")]
+-	public const int64 MIN;
+-	[CCode (cname = "G_MAXINT64")]
+-	public const int64 MAX;
+-
+-	[CCode (cname = "G_GINT64_FORMAT")]
+-	public const string FORMAT;
+-	[Version (since = "2.4")]
+-	[CCode (cname = "G_GINT64_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%" + FORMAT);
+-
+-	[CCode (cname = "MIN")]
+-	public static int64 min (int64 a, int64 b);
+-	[CCode (cname = "MAX")]
+-	public static int64 max (int64 a, int64 b);
+-	[CCode (cname = "CLAMP")]
+-	public int64 clamp (int64 low, int64 high);
+-	[CCode (cname = "llabs", cheader_filename = "stdlib.h")]
+-	public int64 abs ();
+-
+-	[CCode (cname = "GINT64_TO_BE")]
+-	public int64 to_big_endian ();
+-	[CCode (cname = "GINT64_TO_LE")]
+-	public int64 to_little_endian ();
+-
+-	[CCode (cname = "GINT64_FROM_BE")]
+-	public static int64 from_big_endian (int64 val);
+-	[CCode (cname = "GINT64_FROM_LE")]
+-	public static int64 from_little_endian (int64 val);
+-
+-	[CCode (cname = "GUINT64_SWAP_LE_BE")]
+-	public uint64 swap_little_endian_big_endian ();
+-
+-	[CCode (cname = "g_ascii_strtoll")]
+-	static int64 ascii_strtoll (string nptr, out char* endptr, uint _base);
+-
+-	[Version (since = "2.12")]
+-	public static int64 parse (string str) {
+-		return ascii_strtoll (str, null, 0);
+-	}
+-
+-	[Version (since = "2.12")]
+-	public static bool try_parse (string str, out int64 result = null, out unowned string unparsed = null) {
+-		char* endptr;
+-		result = ascii_strtoll (str, out endptr, 0);
+-		if (endptr == (char*) str + str.length) {
+-			unparsed = "";
+-			return true;
+-		} else {
+-			unparsed = (string) endptr;
+-			return false;
+-		}
+-	}
+-
+-	[CCode (cname = "g_ascii_string_to_signed")]
+-	[Version (since = "2.54")]
+-	public static bool from_string (string str, [CCode (pos = 5.1)] out int64 out_num = null, uint @base = 10U, int64 min = int64.MIN, int64 max = int64.MAX) throws GLib.NumberParserError;
+-}
+-
+-[SimpleType]
+-[GIR (name = "guint64")]
+-[CCode (cname = "guint64", cheader_filename = "glib.h", type_id = "G_TYPE_UINT64", marshaller_type_name = "UINT64", get_value_function = "g_value_get_uint64", set_value_function = "g_value_set_uint64", default_value = "0ULL", type_signature = "t")]
+-[IntegerType (rank = 11)]
+-public struct uint64 {
+-	[CCode (cname = "0ULL")]
+-	public const uint64 MIN;
+-	[CCode (cname = "G_MAXUINT64")]
+-	public const uint64 MAX;
+-
+-	[CCode (cname = "G_GUINT64_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GINT64_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%" + FORMAT);
+-
+-	[CCode (cname = "MIN")]
+-	public static uint64 min (uint64 a, uint64 b);
+-	[CCode (cname = "MAX")]
+-	public static uint64 max (uint64 a, uint64 b);
+-	[CCode (cname = "CLAMP")]
+-	public uint64 clamp (uint64 low, uint64 high);
+-
+-	[CCode (cname = "GUINT64_TO_BE")]
+-	public uint64 to_big_endian ();
+-	[CCode (cname = "GUINT64_TO_LE")]
+-	public uint64 to_little_endian ();
+-
+-	[CCode (cname = "GUINT64_FROM_BE")]
+-	public static uint64 from_big_endian (uint64 val);
+-	[CCode (cname = "GUINT64_FROM_LE")]
+-	public static uint64 from_little_endian (uint64 val);
+-
+-	[CCode (cname = "g_ascii_strtoull")]
+-	static uint64 ascii_strtoull (string nptr, out char* endptr, uint _base);
+-
+-	public static uint64 parse (string str) {
+-		return ascii_strtoull (str, null, 0);
+-	}
+-
+-	public static bool try_parse (string str, out uint64 result = null, out unowned string unparsed = null) {
+-		char* endptr;
+-		result = ascii_strtoull (str, out endptr, 0);
+-		if (endptr == (char*) str + str.length) {
+-			unparsed = "";
+-			return true;
+-		} else {
+-			unparsed = (string) endptr;
+-			return false;
+-		}
+-	}
+-
+-	[CCode (cname = "g_ascii_string_to_unsigned")]
+-	[Version (since = "2.54")]
+-	public static bool from_string (string str, [CCode (pos = 5.1)] out uint64 out_num = null, uint @base = 10U, uint64 min = uint64.MIN, uint64 max = uint64.MAX) throws GLib.NumberParserError;
+-}
+-
+-[SimpleType]
+-[GIR (name = "gfloat")]
+-[CCode (cname = "gfloat", cheader_filename = "glib.h,float.h,math.h", type_id = "G_TYPE_FLOAT", marshaller_type_name = "FLOAT", get_value_function = "g_value_get_float", set_value_function = "g_value_set_float", default_value = "0.0F", default_value_on_error = "-1.0F")]
+-[FloatingType (rank = 1)]
+-public struct float {
+-	[CCode (cname = "FLT_ROUNDS")]
+-	public const int ROUNDS;
+-	[CCode (cname = "FLT_RADIX")]
+-	public const int RADIX;
+-	[CCode (cname = "FLT_MANT_DIG")]
+-	public const int MANT_DIG;
+-	[CCode (cname = "FLT_DIG")]
+-	public const int DIG;
+-
+-	[CCode (cname = "FLT_MIN_EXP")]
+-	public const int MIN_EXP;
+-	[CCode (cname = "FLT_MAX_EXP")]
+-	public const int MAX_EXP;
+-
+-	[CCode (cname = "FLT_MIN_10_EXP")]
+-	public const int MIN_10_EXP;
+-	[CCode (cname = "FLT_MAX_10_EXP")]
+-	public const int MAX_10_EXP;
+-
+-	[CCode (cname = "FLT_EPSILON")]
+-	public const float EPSILON;
+-	[CCode (cname = "FLT_MIN")]
+-	public const float MIN;
+-	[CCode (cname = "FLT_MAX")]
+-	public const float MAX;
+-
+-	[CCode (cname = "NAN")]
+-	public const float NAN;
+-	[CCode (cname = "INFINITY")]
+-	public const float INFINITY;
+-
+-	[CCode (cname = "isnan")]
+-	public bool is_nan ();
+-	[CCode (cname = "isfinite")]
+-	public bool is_finite ();
+-	[CCode (cname = "isnormal")]
+-	public bool is_normal ();
+-	[CCode (cname = "isinf")]
+-	public int is_infinity ();
+-
+-	[CCode (cname = "g_strdup_printf", instance_pos = -1)]
+-	public string to_string (string format = "%g");
+-
+-	[CCode (cname = "MIN")]
+-	public static float min (float a, float b);
+-	[CCode (cname = "MAX")]
+-	public static float max (float a, float b);
+-	[CCode (cname = "CLAMP")]
+-	public float clamp (float low, float high);
+-	[CCode (cname = "fabsf")]
+-	public float abs ();
+-
+-	[CCode (cname = "strtof", cheader_filename = "stdlib.h")]
+-	static float strtof (string nptr, out char* endptr);
+-
+-	public static float parse (string str) {
+-		return strtof (str, null);
+-	}
+-
+-	public static bool try_parse (string str, out float result = null, out unowned string unparsed = null) {
+-		char* endptr;
+-		result = strtof (str, out endptr);
+-		if (endptr == (char*) str + str.length) {
+-			unparsed = "";
+-			return true;
+-		} else {
+-			unparsed = (string) endptr;
+-			return false;
+-		}
+-	}
+-}
+-
+-[SimpleType]
+-[GIR (name = "gdouble")]
+-[CCode (cname = "gdouble", cheader_filename = "glib.h,float.h,math.h", type_id = "G_TYPE_DOUBLE", marshaller_type_name = "DOUBLE", get_value_function = "g_value_get_double", set_value_function = "g_value_set_double", default_value = "0.0", default_value_on_error = "-1.0", type_signature = "d")]
+-[FloatingType (rank = 2)]
+-public struct double {
+-	[CCode (cname = "DBL_MANT_DIG")]
+-	public const int MANT_DIG;
+-	[CCode (cname = "DBL_DIG")]
+-	public const int DIG;
+-
+-	[CCode (cname = "DBL_MIN_EXP")]
+-	public const int MIN_EXP;
+-	[CCode (cname = "DBL_MAX_EXP")]
+-	public const int MAX_EXP;
+-
+-	[CCode (cname = "DBL_MIN_10_EXP")]
+-	public const int MIN_10_EXP;
+-	[CCode (cname = "DBL_MAX_10_EXP")]
+-	public const int MAX_10_EXP;
+-
+-	[CCode (cname = "DBL_EPSILON")]
+-	public const double EPSILON;
+-	[CCode (cname = "DBL_MIN")]
+-	public const double MIN;
+-	[CCode (cname = "DBL_MAX")]
+-	public const double MAX;
+-
+-	[CCode (cname = "((double) NAN)")]
+-	public const double NAN;
+-	[CCode (cname = "((double) INFINITY)")]
+-	public const double INFINITY;
+-
+-	[CCode (cname = "isnan")]
+-	public bool is_nan ();
+-	[CCode (cname = "isfinite")]
+-	public bool is_finite ();
+-	[CCode (cname = "isnormal")]
+-	public bool is_normal ();
+-	[CCode (cname = "isinf")]
+-	public int is_infinity ();
+-
+-	[CCode (cname = "MIN")]
+-	public static double min (double a, double b);
+-	[CCode (cname = "MAX")]
+-	public static double max (double a, double b);
+-	[CCode (cname = "CLAMP")]
+-	public double clamp (double low, double high);
+-	[CCode (cname = "fabs")]
+-	public double abs ();
+-
+-	[CCode (cname = "G_ASCII_DTOSTR_BUF_SIZE")]
+-	public const int DTOSTR_BUF_SIZE;
+-	[CCode (cname = "g_ascii_dtostr", instance_pos = -1)]
+-	public unowned string to_str (char[] buffer);
+-	[CCode (cname = "g_ascii_formatd", instance_pos = -1)]
+-	public unowned string format (char[] buffer, string format = "%g");
+-
+-	public string to_string () {
+-		return this.to_str(new char[DTOSTR_BUF_SIZE]);
+-	}
+-
+-	[CCode (cname = "g_ascii_strtod")]
+-	static double ascii_strtod (string nptr, out char* endptr);
+-
+-	public static double parse (string str) {
+-		return ascii_strtod (str, null);
+-	}
+-
+-	public static bool try_parse (string str, out double result = null, out unowned string unparsed = null) {
+-		char* endptr;
+-		result = ascii_strtod (str, out endptr);
+-		if (endptr == (char*) str + str.length) {
+-			unparsed = "";
+-			return true;
+-		} else {
+-			unparsed = (string) endptr;
+-			return false;
+-		}
+-	}
+-}
+-
+-[GIR (name = "glong")]
+-[CCode (cheader_filename = "time.h", has_type_id = false, default_value = "0")]
+-[IntegerType (rank = 8)]
+-public struct time_t {
+-	[CCode (cname = "time")]
+-	public time_t (out time_t result = null);
+-}
+-
+-[SimpleType]
+-[CCode (cheader_filename="stdarg.h", cprefix="va_", has_type_id = false, destroy_function = "va_end", lvalue_access = false)]
+-public struct va_list {
+-	[CCode (cname = "va_start")]
+-	public va_list ();
+-	[CCode (cname = "va_copy")]
+-	public va_list.copy (va_list src);
+-	[CCode (generic_type_pos = 1.1, simple_generics = true)]
+-	public unowned G arg<G> ();
+-}
+-
+-[SimpleType]
+-[GIR (name = "gunichar")]
+-[CCode (cname = "gunichar", cprefix = "g_unichar_", cheader_filename = "glib.h", type_id = "G_TYPE_UINT", marshaller_type_name = "UINT", get_value_function = "g_value_get_uint", set_value_function = "g_value_set_uint", default_value = "0U", type_signature = "u")]
+-[IntegerType (rank = 7)]
+-public struct unichar {
+-	public bool validate ();
+-	public bool isalnum ();
+-	public bool isalpha ();
+-	public bool iscntrl ();
+-	public bool isdigit ();
+-	public bool isgraph ();
+-	public bool islower ();
+-	[Version (since = "2.14")]
+-	public bool ismark ();
+-	public bool isprint ();
+-	public bool ispunct ();
+-	public bool isspace ();
+-	public bool isupper ();
+-	public bool isxdigit ();
+-	public bool istitle ();
+-	public bool isdefined ();
+-	public bool iswide ();
+-	[Version (since = "2.12")]
+-	public bool iswide_cjk ();
+-	[Version (since = "2.14")]
+-	public bool iszerowidth ();
+-	public unichar toupper ();
+-	public unichar tolower ();
+-	public unichar totitle ();
+-	public int digit_value ();
+-	public int xdigit_value ();
+-	public GLib.UnicodeType type ();
+-	public GLib.UnicodeBreakType break_type ();
+-	[Version (since = "2.14")]
+-	public GLib.UnicodeScript get_script();
+-
+-	public int to_utf8 (string? outbuf);
+-
+-	public string to_string () {
+-		string str = (string) new char[7];
+-		this.to_utf8 (str);
+-		return str;
+-	}
+-
+-	[Version (since = "2.30")]
+-	public bool compose (unichar b, out unichar ch);
+-	[Version (since = "2.30")]
+-	public bool decompose (out unichar a, out unichar b);
+-	[Version (since = "2.30")]
+-	public size_t fully_decompose (bool compat, unichar[] result);
+-
+-	[CCode (cname = "MIN")]
+-	public static unichar min (unichar a, unichar b);
+-	[CCode (cname = "MAX")]
+-	public static unichar max (unichar a, unichar b);
+-	[CCode (cname = "CLAMP")]
+-	public unichar clamp (unichar low, unichar high);
+-
+-	[CCode (cname = "G_UNICHAR_MAX_DECOMPOSITION_LENGTH")]
+-	public const int MAX_DECOMPOSITION_LENGTH;
+-
+-	[CCode (cname = "G_GUINT32_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GINT32_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-}
+-
+-[SimpleType]
+-[GIR (name = "guint16")]
+-[CCode (cname = "gunichar2", cheader_filename = "glib.h", default_value = "0U", type_signature = "q", has_type_id = false)]
+-[IntegerType (rank = 5)]
+-public struct unichar2 {
+-	[CCode (cname = "G_GUINT16_FORMAT")]
+-	public const string FORMAT;
+-	[CCode (cname = "G_GINT16_MODIFIER")]
+-	public const string FORMAT_MODIFIER;
+-}
+-
+-[Compact]
+-[Immutable]
+-[GIR (name = "utf8")]
+-[CCode (cname = "gchar", const_cname = "const gchar", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "G_TYPE_STRING", marshaller_type_name = "STRING", param_spec_function = "g_param_spec_string", get_value_function = "g_value_get_string", set_value_function = "g_value_set_string", take_value_function = "g_value_take_string", type_signature = "s")]
+-public class string {
+-	[Version (replacement = "string.index_of")]
+-	[CCode (cname = "strstr")]
+-	public unowned string? str (string needle);
+-	[Version (replacement = "string.last_index_of")]
+-	[CCode (cname = "g_strrstr")]
+-	public unowned string? rstr (string needle);
+-	[CCode (cname = "g_strrstr_len")]
+-	public unowned string? rstr_len (ssize_t haystack_len, string needle);
+-
+-	[CCode (cname = "strstr")]
+-	static char* strstr (char* haystack, char* needle);
+-	[CCode (cname = "g_strrstr")]
+-	static char* strrstr (char* haystack, char* needle);
+-	[CCode (cname = "g_utf8_strchr")]
+-	static char* utf8_strchr (char* str, ssize_t len, unichar c);
+-	[CCode (cname = "g_utf8_strrchr")]
+-	static char* utf8_strrchr (char* str, ssize_t len, unichar c);
+-
+-	public int index_of (string needle, int start_index = 0) {
+-		char* result = strstr ((char*) this + start_index, (char*) needle);
+-
+-		if (result != null) {
+-			return (int) (result - (char*) this);
+-		} else {
+-			return -1;
+-		}
+-	}
+-
+-	public int last_index_of (string needle, int start_index = 0) {
+-		char* result = strrstr ((char*) this + start_index, (char*) needle);
+-
+-		if (result != null) {
+-			return (int) (result - (char*) this);
+-		} else {
+-			return -1;
+-		}
+-	}
+-
+-	public int index_of_char (unichar c, int start_index = 0) {
+-		char* result = utf8_strchr ((char*) this + start_index, -1, c);
+-
+-		if (result != null) {
+-			return (int) (result - (char*) this);
+-		} else {
+-			return -1;
+-		}
+-	}
+-
+-	public int last_index_of_char (unichar c, int start_index = 0) {
+-		char* result = utf8_strrchr ((char*) this + start_index, -1, c);
+-
+-		if (result != null) {
+-			return (int) (result - (char*) this);
+-		} else {
+-			return -1;
+-		}
+-	}
+-
+-	[Version (since = "2.2")]
+-	[CCode (cname = "g_str_has_prefix")]
+-	public bool has_prefix (string prefix);
+-	[Version (since = "2.2")]
+-	[CCode (cname = "g_str_has_suffix")]
+-	public bool has_suffix (string suffix);
+-	[CCode (cname = "g_strdup_printf"), PrintfFormat]
+-	public string printf (...);
+-	[CCode (cname = "g_strdup_vprintf")]
+-	public string vprintf (va_list args);
+-	[CCode (cname = "sscanf", cheader_filename = "stdio.h"), ScanfFormat]
+-	public int scanf (string format, ...);
+-	[CCode (cname = "g_strconcat")]
+-	public string concat (string string2, ...);
+-	[CCode (cname = "g_strescape")]
+-	public string escape (string? exceptions = null);
+-	[CCode (cname = "g_strcompress")]
+-	public string compress ();
+-	[CCode (cname = "g_strsplit", array_length = false, array_null_terminated = true)]
+-	public string[] split (string delimiter, int max_tokens = 0);
+-	[Version (since = "2.4")]
+-	[CCode (cname = "g_strsplit_set", array_length = false, array_null_terminated = true)]
+-	public string[] split_set (string delimiters, int max_tokens = 0);
+-	[CCode (cname = "g_stpcpy")]
+-	private static void* copy_to_buffer (void* dest, string src);
+-	[CCode (cname = "_vala_g_strjoinv")]
+-	public static string joinv (string? separator, string?[]? str_array) {
+-		if (separator == null) {
+-			separator = "";
+-		}
+-		if (str_array != null && (str_array.length > 0 || (str_array.length == -1 && str_array[0] != null))) {
+-			int i;
+-			size_t len = 1;
+-			for (i = 0 ; (str_array.length != -1 && i < str_array.length) || (str_array.length == -1 && str_array[i] != null) ; i++) {
+-				len += (str_array[i] != null) ? ((!) str_array[i]).length : 0;
+-			}
+-			if (i == 0) {
+-				return "";
+-			}
+-			str_array.length = i;
+-			len += ((!) separator).length * (i - 1);
+-
+-			string* res = GLib.malloc (len);
+-			void* ptr = string.copy_to_buffer ((void*) res, (!) str_array[0]);
+-			for (i = 1 ; i < str_array.length ; i++) {
+-				ptr = string.copy_to_buffer (ptr, (!) separator);
+-				ptr = string.copy_to_buffer (ptr, (str_array[i] != null) ? ((!) str_array[i]) : "");
+-			}
+-
+-			return (owned) res;
+-		} else {
+-			return "";
+-		}
+-	}
+-	[CCode (cname = "g_strjoin")]
+-	public static string join (string separator, ...);
+-	[CCode (cname = "g_strnfill")]
+-	public static string nfill (size_t length, char fill_char);
+-
+-	public char get (long index) {
+-		return ((char*) this)[index];
+-	}
+-
+-	// checks whether valid string character starts at specified index
+-	// embedded NULs are not supported by the string class
+-	public bool valid_char (int index) {
+-		uint8 c = ((uint8*) this)[index];
+-		if (c == 0x00 || (c >= 0x80 && c < 0xc2) || c >= 0xf5) {
+-			return false;
+-		} else {
+-			return true;
+-		}
+-	}
+-
+-	[CCode (cname = "g_utf8_next_char")]
+-	public unowned string next_char ();
+-	[CCode (cname = "g_utf8_next_char")]
+-	static char* utf8_next_char (char* str);
+-	public bool get_next_char (ref int index, out unichar c) {
+-		c = utf8_get_char ((char*) this + index);
+-		if (c != 0) {
+-			index = (int) (utf8_next_char ((char*) this + index) - (char*) this);
+-			return true;
+-		} else {
+-			return false;
+-		}
+-	}
+-	[CCode (cname = "g_utf8_get_char")]
+-	static unichar utf8_get_char (char* str);
+-	public unichar get_char (long index = 0) {
+-		return utf8_get_char ((char*) this + index);
+-	}
+-	[CCode (cname = "g_utf8_get_char_validated")]
+-	public unichar get_char_validated (ssize_t max_len = -1);
+-
+-	[Version (replacement = "string.index_of_nth_char")]
+-	[CCode (cname = "g_utf8_offset_to_pointer")]
+-	public unowned string utf8_offset (long offset);
+-	public unowned string offset (long offset) {
+-		return (string) ((char*) this + offset);
+-	}
+-	[Version (replacement = "string.char_count")]
+-	public long pointer_to_offset (string pos) {
+-		return (long) ((char*) pos - (char*) this);
+-	}
+-
+-	[CCode (cname = "g_utf8_offset_to_pointer")]
+-	char* utf8_offset_to_pointer (long offset);
+-
+-	public int index_of_nth_char (long c) {
+-		return (int) (this.utf8_offset_to_pointer (c) - (char*) this);
+-	}
+-
+-	[CCode (cname = "g_utf8_prev_char")]
+-	public unowned string prev_char ();
+-	[CCode (cname = "g_utf8_prev_char")]
+-	static char* utf8_prev_char (char* str);
+-	public bool get_prev_char (ref int index, out unichar c) {
+-		if (0 < index) {
+-			index = (int) (utf8_prev_char ((char*) this + index) - (char*) this);
+-			c = utf8_get_char ((char*) this + index);
+-			return true;
+-		} else {
+-			c = 0;
+-			return false;
+-		}
+-	}
+-
+-	[Version (replacement = "string.length")]
+-	[CCode (cname = "strlen")]
+-	public long len ();
+-	[Version (replacement = "string.index_of_char")]
+-	[CCode (cname = "g_utf8_strchr")]
+-	public unowned string chr (ssize_t len, unichar c);
+-	[Version (replacement = "string.last_index_of_char")]
+-	[CCode (cname = "g_utf8_strrchr")]
+-	public unowned string rchr (ssize_t len, unichar c);
+-	[Version (since = "2.2")]
+-	[CCode (cname = "g_utf8_strreverse")]
+-	public string reverse (ssize_t len = -1);
+-	[CCode (cname = "g_utf8_validate")]
+-	public bool validate (ssize_t max_len = -1, out char* end = null);
+-	[Version (since = "2.52")]
+-	[CCode (cname = "g_utf8_make_valid")]
+-	public string make_valid (ssize_t len = -1);
+-	[CCode (cname = "g_utf8_normalize")]
+-	public string normalize (ssize_t len = -1, GLib.NormalizeMode mode = GLib.NormalizeMode.DEFAULT);
+-
+-	[CCode (cname = "g_utf8_strup")]
+-	public string up (ssize_t len = -1);
+-	[CCode (cname = "g_utf8_strdown")]
+-	public string down (ssize_t len = -1);
+-	[CCode (cname = "g_utf8_casefold")]
+-	public string casefold (ssize_t len = -1);
+-	[CCode (cname = "g_utf8_collate")]
+-	public int collate (string str2);
+-	[CCode (cname = "g_utf8_collate_key")]
+-	public string collate_key (ssize_t len = -1);
+-	[Version (since = "2.8")]
+-	[CCode (cname = "g_utf8_collate_key_for_filename")]
+-	public string collate_key_for_filename (ssize_t len = -1);
+-
+-	[CCode (cname = "g_locale_to_utf8")]
+-	public string locale_to_utf8 (ssize_t len, out size_t bytes_read, out size_t bytes_written, out GLib.Error error = null);
+-
+-	[CCode (cname = "g_strchomp")]
+-	public unowned string _chomp();
+-	public string chomp () {
+-		string result = this.dup ();
+-		result._chomp ();
+-		return result;
+-	}
+-
+-	[CCode (cname = "g_strchug")]
+-	public unowned string _chug();
+-	public string chug () {
+-		string result = this.dup ();
+-		result._chug ();
+-		return result;
+-	}
+-
+-	[CCode (cname = "g_strstrip")]
+-	public unowned string _strip ();
+-	public string strip () {
+-		string result = this.dup ();
+-		result._strip ();
+-		return result;
+-	}
+-
+-	[CCode (cname = "g_strdelimit")]
+-	public unowned string _delimit (string delimiters, char new_delimiter);
+-	public string delimit (string delimiters, char new_delimiter) {
+-		string result = this.dup ();
+-		result._delimit (delimiters, new_delimiter);
+-		return result;
+-	}
+-
+-	[CCode (cname = "g_str_hash")]
+-	public uint hash ();
+-
+-	[Version (since = "2.40")]
+-	[CCode (cname = "g_str_is_ascii")]
+-	public bool is_ascii ();
+-	[Version (since = "2.40")]
+-	[CCode (instance_pos = "1.5", cname = "g_str_match_string")]
+-	public bool match_string (string search_term, bool accept_alternates);
+-	[Version (since = "2.40")]
+-	[CCode (cname = "g_str_to_ascii")]
+-	public string to_ascii (string? from_locale = null);
+-	[Version (replacement = "int.parse")]
+-	[CCode (cname = "atoi")]
+-	public int to_int ();
+-	[Version (replacement = "long.parse")]
+-	[CCode (cname = "strtol")]
+-	public long to_long (out unowned string endptr = null, int _base = 0);
+-	[Version (replacement = "double.parse")]
+-	[CCode (cname = "g_ascii_strtod")]
+-	public double to_double (out unowned string endptr = null);
+-	[Version (replacement = "ulong.parse")]
+-	[CCode (cname = "strtoul")]
+-	public ulong to_ulong (out unowned string endptr = null, int _base = 0);
+-	[Version (replacement = "int64.parse")]
+-	[CCode (cname = "g_ascii_strtoll")]
+-	public int64 to_int64 (out unowned string endptr = null, int _base = 0);
+-	[Version (replacement = "uint64.parse", since = "2.2")]
+-	[CCode (cname = "g_ascii_strtoull")]
+-	public uint64 to_uint64 (out unowned string endptr = null, int _base = 0);
+-	[CCode (cname = "g_str_tokenize_and_fold", array_length = false, array_null_terminated = true)]
+-	[Version (since = "2.40")]
+-	public string[] tokenize_and_fold (string transit_locale, [CCode (array_length = false, array_null_terminated = true)] out string[] ascii_alternates);
+-
+-	[Version (replacement = "bool.parse")]
+-	public bool to_bool () {
+-		if (this == "true") {
+-			return true;
+-		} else {
+-			return false;
+-		}
+-	}
+-
+-	[Version (replacement = "string.length")]
+-	[CCode (cname = "strlen")]
+-	public size_t size ();
+-
+-	[CCode (cname = "g_ascii_strcasecmp")]
+-	public int ascii_casecmp (string s2);
+-	[CCode (cname = "g_ascii_strncasecmp")]
+-	public int ascii_ncasecmp (string s2, size_t n);
+-	[CCode (cname = "g_ascii_strup")]
+-	public string ascii_up (ssize_t len = -1);
+-	[CCode (cname = "g_ascii_strdown")]
+-	public string ascii_down (ssize_t len = -1);
+-
+-	[CCode (cname = "g_utf8_skip")]
+-	public static char skip[256];
+-
+-	/* modifies string in place */
+-	[CCode (cname = "g_strcanon")]
+-	public void canon (string valid_chars, char substitutor);
+-
+-	[CCode (cname = "g_strdup")]
+-	public string dup ();
+-	[Version (replacement = "string.substring")]
+-	[CCode (cname = "g_strndup")]
+-	public string ndup (size_t n);
+-
+-	[CCode (cname = "memchr")]
+-	static char* memchr (char* s, int c, size_t n);
+-
+-	// strnlen is not available on all systems
+-	static long strnlen (char* str, long maxlen) {
+-		char* end = memchr (str, 0, maxlen);
+-		if (end == null) {
+-			return maxlen;
+-		} else {
+-			return (long) (end - str);
+-		}
+-	}
+-
+-	[CCode (cname = "g_strndup")]
+-	static string strndup (char* str, size_t n);
+-
+-	public string substring (long offset, long len = -1) {
+-		long string_length;
+-		if (offset >= 0 && len >= 0) {
+-			// avoid scanning whole string
+-			string_length = strnlen ((char*) this, offset + len);
+-		} else {
+-			string_length = this.length;
+-		}
+-
+-		if (offset < 0) {
+-			offset = string_length + offset;
+-			GLib.return_val_if_fail (offset >= 0, null);
+-		} else {
+-			GLib.return_val_if_fail (offset <= string_length, null);
+-		}
+-		if (len < 0) {
+-			len = string_length - offset;
+-		}
+-		GLib.return_val_if_fail (offset + len <= string_length, null);
+-		return strndup ((char*) this + offset, len);
+-	}
+-
+-	public string slice (long start, long end) {
+-		long string_length = this.length;
+-		if (start < 0) {
+-			start = string_length + start;
+-		}
+-		if (end < 0) {
+-			end = string_length + end;
+-		}
+-		GLib.return_val_if_fail (start >= 0 && start <= string_length, null);
+-		GLib.return_val_if_fail (end >= 0 && end <= string_length, null);
+-		GLib.return_val_if_fail (start <= end, null);
+-		return strndup ((char*) this + start, end - start);
+-	}
+-
+-	public string splice (long start, long end, string? str = null) {
+-		long string_length = this.length;
+-		if (start < 0) {
+-			start = string_length + start;
+-		}
+-		if (end < 0) {
+-			end = string_length + end;
+-		}
+-		GLib.return_val_if_fail (start >= 0 && start <= string_length, null);
+-		GLib.return_val_if_fail (end >= 0 && end <= string_length, null);
+-		GLib.return_val_if_fail (start <= end, null);
+-
+-		size_t str_size;
+-		if (str == null) {
+-			str_size = 0;
+-		} else {
+-			str_size = ((!)(str)).length;
+-		}
+-
+-		string* result = GLib.malloc0 (string_length - (end - start) + str_size + 1);
+-
+-		char* dest = (char*) result;
+-
+-		GLib.Memory.copy (dest, this, start);
+-		dest += start;
+-
+-		GLib.Memory.copy (dest, str, str_size);
+-		dest += str_size;
+-
+-		GLib.Memory.copy (dest, (char*) this + end, string_length - end);
+-
+-		return (owned) result;
+-	}
+-
+-	public bool contains (string needle) {
+-		return strstr ((char*) this, (char*) needle) != null;
+-	}
+-
+-	public string replace (string old, string replacement) {
+-		if (*((char*) this) == '\0' || *((char*) old) == '\0' || old == replacement)
+-			return this;
+-
+-		try {
+-			var regex = new GLib.Regex (GLib.Regex.escape_string (old));
+-			return regex.replace_literal (this, -1, 0, replacement);
+-		} catch (GLib.RegexError e) {
+-			GLib.assert_not_reached ();
+-		}
+-	}
+-
+-	[CCode (cname = "g_utf8_strlen")]
+-	public int char_count (ssize_t max = -1);
+-
+-	public int length {
+-		[CCode (cname = "strlen")]
+-		get;
+-	}
+-
+-	public uint8[] data {
+-		get {
+-			unowned uint8[] res = (uint8[]) this;
+-			res.length = (int) this.length;
+-			return res;
+-		}
+-	}
+-
+-	public char[] to_utf8 () {
+-		var string_length = this.length;
+-		char[] result = new char[string_length + 1];
+-		result.length--;
+-		GLib.Memory.copy (result, this, string_length);
+-		return result;
+-	}
+-
+-	public unowned string to_string () {
+-		return this;
+-	}
+-
+-	[CCode (cname = "g_utf8_to_utf16")]
+-	public string16 to_utf16 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
+-	[CCode (cname = "g_utf8_to_ucs4")]
+-	public string32 to_utf32 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
+-	[CCode (cname = "g_utf8_to_ucs4_fast")]
+-	public string32 to_utf32_fast (long len = -1, out long items_written = null);
+-
+-}
+-
+-[Compact]
+-[Immutable]
+-[GIR (name = "gunichar")]
+-[CCode (cname = "gunichar", const_cname = "const gunichar", free_function = "g_free", cheader_filename = "glib.h")]
+-public class string32 {
+-	[CCode (cname = "g_ucs4_to_utf16")]
+-	public string16 to_utf16 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
+-	[CCode (cname = "g_ucs4_to_utf8")]
+-	public string to_utf8 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
+-
+-	public string? to_string () {
+-		try {
+-			return this.to_utf8 ();
+-		} catch (GLib.ConvertError e) {
+-			return null;
+-		}
+-	}
+-}
+-
+-[Compact]
+-[Immutable]
+-[GIR (name = "guint16")]
+-[CCode (cname = "gunichar2", const_cname = "const gunichar2", free_function = "g_free", cheader_filename = "glib.h")]
+-public class string16 {
+-	[CCode (cname = "g_utf16_to_ucs4")]
+-	public string32 to_utf32 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
+-	[CCode (cname = "g_utf16_to_utf8")]
+-	public string to_utf8 (long len = -1, out long items_read = null, out long items_written = null) throws GLib.ConvertError;
+-
+-	public string? to_string () {
+-		try {
+-			return this.to_utf8 ();
+-		} catch (GLib.ConvertError e) {
+-			return null;
+-		}
+-	}
+-}
+-
+-[CCode (cprefix = "G", lower_case_cprefix = "g_", cheader_filename = "glib.h", gir_namespace = "GLib", gir_version = "2.0")]
+-namespace GLib {
+-	[PointerType]
+-	[GIR (fullname = "gpointer")]
+-	[CCode (cname = "gpointer", const_cname = "gconstpointer", cheader_filename = "glib.h")]
+-	public struct pointer {
+-	}
+-
+-	[CCode (lower_case_cprefix = "", cheader_filename = "math.h")]
+-	namespace Math {
+-		[CCode (cname = "G_E")]
+-		public const double E;
+-
+-		[CCode (cname = "G_PI")]
+-		public const double PI;
+-
+-		[CCode (cname = "G_LN2")]
+-		public const double LN2;
+-
+-		[CCode (cname = "G_LN10")]
+-		public const double LN10;
+-
+-		[CCode (cname = "G_PI_2")]
+-		public const double PI_2;
+-
+-		[CCode (cname = "G_PI_4")]
+-		public const double PI_4;
+-
+-		[CCode (cname = "G_SQRT2")]
+-		public const double SQRT2;
+-
+-		[CCode (cname = "G_LOG_2_BASE_10")]
+-		public const double LOG_2_BASE_10;
+-
+-		/* generated from <bits/mathcalls.h> of glibc */
+-		public static double acos (double x);
+-		public static float acosf (float x);
+-		public static double asin (double x);
+-		public static float asinf (float x);
+-		public static double atan (double x);
+-		public static float atanf (float x);
+-		public static double atan2 (double y, double x);
+-		public static float atan2f (float y, float x);
+-		public static double cos (double x);
+-		public static float cosf (float x);
+-		public static double sin (double x);
+-		public static float sinf (float x);
+-		public static double tan (double x);
+-		public static float tanf (float x);
+-		public static double cosh (double x);
+-		public static float coshf (float x);
+-		public static double sinh (double x);
+-		public static float sinhf (float x);
+-		public static double tanh (double x);
+-		public static float tanhf (float x);
+-		public static void sincos (double x, out double sinx, out double cosx);
+-		public static void sincosf (float x, out float sinx, out float cosx);
+-		public static double acosh (double x);
+-		public static float acoshf (float x);
+-		public static double asinh (double x);
+-		public static float asinhf (float x);
+-		public static double atanh (double x);
+-		public static float atanhf (float x);
+-		public static double exp (double x);
+-		public static float expf (float x);
+-		public static double frexp (double x, out int exponent);
+-		public static float frexpf (float x, out int exponent);
+-		public static double ldexp (double x, int exponent);
+-		public static float ldexpf (float x, int exponent);
+-		public static double log (double x);
+-		public static float logf (float x);
+-		public static double log10 (double x);
+-		public static float log10f (float x);
+-		public static double modf (double x, out double iptr);
+-		public static float modff (float x, out float iptr);
+-		[CCode (feature_test_macro = "_GNU_SOURCE")]
+-		public static double exp10 (double x);
+-		[CCode (feature_test_macro = "_GNU_SOURCE")]
+-		public static float exp10f (float x);
+-		[CCode (feature_test_macro = "_GNU_SOURCE")]
+-		public static double pow10 (double x);
+-		[CCode (feature_test_macro = "_GNU_SOURCE")]
+-		public static float pow10f (float x);
+-		public static double expm1 (double x);
+-		public static float expm1f (float x);
+-		public static double log1p (double x);
+-		public static float log1pf (float x);
+-		public static double logb (double x);
+-		public static float logbf (float x);
+-		public static double exp2 (double x);
+-		public static float exp2f (float x);
+-		public static double log2 (double x);
+-		public static float log2f (float x);
+-		public static double pow (double x, double y);
+-		public static float powf (float x, float y);
+-		public static double sqrt (double x);
+-		public static float sqrtf (float x);
+-		public static double hypot (double x, double y);
+-		public static float hypotf (float x, float y);
+-		public static double cbrt (double x);
+-		public static float cbrtf (float x);
+-		public static double ceil (double x);
+-		public static float ceilf (float x);
+-		public static double fabs (double x);
+-		public static float fabsf (float x);
+-		public static double floor (double x);
+-		public static float floorf (float x);
+-		public static double fmod (double x, double y);
+-		public static float fmodf (float x, float y);
+-		public static int isinf (double value);
+-		public static int isinff (float value);
+-		public static int finite (double value);
+-		public static int finitef (float value);
+-		public static double drem (double x, double y);
+-		public static float dremf (float x, float y);
+-		public static double significand (double x);
+-		public static float significandf (float x);
+-		public static double copysign (double x, double y);
+-		public static float copysignf (float x, float y);
+-		public static double nan (string tagb);
+-		public static float nanf (string tagb);
+-		public static int isnan (double value);
+-		public static int isnanf (float value);
+-		public static double j0 (double x0);
+-		public static float j0f (float x0);
+-		public static double j1 (double x0);
+-		public static float j1f (float x0);
+-		public static double jn (int x0, double x1);
+-		public static float jnf (int x0, float x1);
+-		public static double y0 (double x0);
+-		public static float y0f (float x0);
+-		public static double y1 (double x0);
+-		public static float y1f (float x0);
+-		public static double yn (int x0, double x1);
+-		public static float ynf (int x0, float x1);
+-		public static double erf (double x0);
+-		public static float erff (float x0);
+-		public static double erfc (double x0);
+-		public static float erfcf (float x0);
+-		public static double lgamma (double x0);
+-		public static float lgammaf (float x0);
+-		public static double tgamma (double x0);
+-		public static float tgammaf (float x0);
+-		public static double gamma (double x0);
+-		public static float gammaf (float x0);
+-		public static double lgamma_r (double x0, out int signgamp);
+-		public static float lgamma_rf (float x0, out int signgamp);
+-		public static double rint (double x);
+-		public static float rintf (float x);
+-		public static double nextafter (double x, double y);
+-		public static float nextafterf (float x, float y);
+-		public static double nexttoward (double x, double y);
+-		public static float nexttowardf (float x, double y);
+-		public static double remainder (double x, double y);
+-		public static float remainderf (float x, float y);
+-		public static double scalbn (double x, int n);
+-		public static float scalbnf (float x, int n);
+-		public static int ilogb (double x);
+-		public static int ilogbf (float x);
+-		public static double scalbln (double x, long n);
+-		public static float scalblnf (float x, long n);
+-		public static double nearbyint (double x);
+-		public static float nearbyintf (float x);
+-		public static double round (double x);
+-		public static float roundf (float x);
+-		public static double trunc (double x);
+-		public static float truncf (float x);
+-		public static double remquo (double x, double y, out int quo);
+-		public static float remquof (float x, float y, out int quo);
+-		public static long lrint (double x);
+-		public static long lrintf (float x);
+-		public static int64 llrint (double x);
+-		public static int64 llrintf (float x);
+-		public static long lround (double x);
+-		public static long lroundf (float x);
+-		public static int64 llround (double x);
+-		public static int64 llroundf (float x);
+-		public static double fdim (double x, double y);
+-		public static float fdimf (float x, float y);
+-		public static double fmax (double x, double y);
+-		public static float fmaxf (float x, float y);
+-		public static double fmin (double x, double y);
+-		public static float fminf (float x, float y);
+-		public static double fma (double x, double y, double z);
+-		public static float fmaf (float x, float y, float z);
+-		public static double scalb (double x, double n);
+-		public static float scalbf (float x, float n);
+-	}
+-
+-	/* Byte order */
+-	[CCode (cprefix = "G_", cname = "int", has_type_id = false)]
+-	public enum ByteOrder {
+-		[CCode (cname = "G_BYTE_ORDER")]
+-		HOST,
+-		LITTLE_ENDIAN,
+-		BIG_ENDIAN,
+-		PDP_ENDIAN
+-	}
+-
+-	public const ByteOrder BYTE_ORDER;
+-
+-	/* Atomic Operations */
+-
+-	[Version (since = "2.4")]
+-	namespace AtomicInt {
+-		public static int get ([CCode (type = "volatile gint *")] ref int atomic);
+-		public static void set ([CCode (type = "volatile gint *")] ref int atomic, int newval);
+-		[Version (since = "2.30")]
+-		public static int add ([CCode (type = "volatile gint *")] ref int atomic, int val);
+-		[Version (deprecated_since = "2.30", replacement = "add")]
+-		public static int exchange_and_add ([CCode (type = "volatile gint *")] ref int atomic, int val);
+-		public static bool compare_and_exchange ([CCode (type = "volatile gint *")] ref int atomic, int oldval, int newval);
+-		public static void inc ([CCode (type = "volatile gint *")] ref int atomic);
+-		public static bool dec_and_test ([CCode (type = "volatile gint *")] ref int atomic);
+-	}
+-
+-	[Version (since = "2.4")]
+-	namespace AtomicPointer {
+-		public static void* get ([CCode (type = "volatile gpointer *")] void** atomic);
+-		public static void set ([CCode (type = "volatile gpointer *")] void** atomic, void* newval);
+-		public static bool compare_and_exchange ([CCode (type = "volatile gpointer *")] void** atomic, void* oldval, void* newval);
+-	}
+-
+-	/* The Main Event Loop */
+-
+-	[Compact]
+-	[CCode (ref_function = "g_main_loop_ref", unref_function = "g_main_loop_unref")]
+-	public class MainLoop {
+-		public MainLoop (MainContext? context = null, bool is_running = false);
+-		public void run ();
+-		public void quit ();
+-		public bool is_running ();
+-		public unowned MainContext get_context ();
+-	}
+-
+-	namespace Priority {
+-		public const int HIGH;
+-		public const int DEFAULT;
+-		public const int HIGH_IDLE;
+-		public const int DEFAULT_IDLE;
+-		public const int LOW;
+-	}
+-
+-	[Compact]
+-	[CCode (ref_function = "g_main_context_ref", unref_function = "g_main_context_unref")]
+-	public class MainContext {
+-		public MainContext ();
+-		public static unowned MainContext @default ();
+-		public bool iteration (bool may_block);
+-		public bool pending ();
+-		public unowned Source find_source_by_id (uint source_id);
+-		public unowned Source find_source_by_user_data (void* user_data);
+-		public unowned Source find_source_by_funcs_user_data (SourceFuncs funcs, void* user_data);
+-		public void wakeup ();
+-		public bool acquire ();
+-		public void release ();
+-		[Version (since = "2.10")]
+-		public bool is_owner ();
+-		public bool wait (Cond cond, Mutex mutex);
+-		public bool prepare (out int priority);
+-		public int query (int max_priority, out int timeout_, PollFD[] fds);
+-		public bool check (int max_priority, PollFD[] fds);
+-		public void dispatch ();
+-		public void set_poll_func (PollFunc func);
+-		public PollFunc get_poll_func ();
+-		public void add_poll (ref PollFD fd, int priority);
+-		public void remove_poll (ref PollFD fd);
+-		public int depth ();
+-		[Version (since = "2.12")]
+-		[CCode (cname = "g_main_current_source")]
+-		public static unowned Source current_source ();
+-		[Version (since = "2.22")]
+-		public static unowned MainContext? get_thread_default ();
+-		[Version (since = "2.32")]
+-		public static MainContext ref_thread_default ();
+-		[Version (since = "2.22")]
+-		public void push_thread_default ();
+-		[Version (since = "2.22")]
+-		public void pop_thread_default ();
+-		[Version (since = "2.28")]
+-		[CCode (cname = "g_main_context_invoke_full")]
+-		public void invoke (owned SourceFunc function, [CCode (pos = 0.1)] int priority = Priority.DEFAULT);
+-		[Version (since = "2.28")]
+-		public void invoke_full (int priority, owned SourceFunc function);
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate int PollFunc (PollFD[] ufds, int timeout_);
+-
+-	[CCode (cname = "GSource")]
+-	public class TimeoutSource : Source {
+-		public TimeoutSource (uint interval);
+-		[Version (since = "2.14")]
+-		public TimeoutSource.seconds (uint interval);
+-	}
+-
+-	namespace Timeout {
+-		[CCode (cname = "g_timeout_add_full")]
+-		public static uint add (uint interval, owned SourceFunc function, [CCode (pos = 0.1)] int priority = Priority.DEFAULT);
+-		public static uint add_full (int priority, uint interval, owned SourceFunc function);
+-		[Version (since = "2.14")]
+-		[CCode (cname = "g_timeout_add_seconds_full")]
+-		public static uint add_seconds (uint interval, owned SourceFunc function, [CCode (pos = 0.1)] int priority = Priority.DEFAULT);
+-		[Version (since = "2.14")]
+-		public static uint add_seconds_full (int priority, uint interval, owned SourceFunc function);
+-	}
+-
+-	[CCode (cname = "GSource")]
+-	public class IdleSource : Source {
+-		public IdleSource ();
+-	}
+-
+-	namespace Idle {
+-		[CCode (cname = "g_idle_add_full")]
+-		public static uint add (owned SourceFunc function, [CCode (pos = 0.1)] int priority = Priority.DEFAULT_IDLE);
+-		public static uint add_full (int priority, owned SourceFunc function);
+-		public static bool remove_by_data (void* data);
+-	}
+-
+-	[CCode (type_id = "G_TYPE_INT", marshaller_type_name = "INT", get_value_function = "g_value_get_int", set_value_function = "g_value_set_int", default_value = "0")]
+-	[IntegerType (rank = 6)]
+-	public struct Pid : int {
+-		[CCode (cname = "G_PID_FORMAT")]
+-		[Version (since = "2.50")]
+-		public const string FORMAT;
+-	}
+-
+-	public delegate void ChildWatchFunc (Pid pid, int status);
+-
+-	[CCode (cname = "GSource")]
+-	public class ChildWatchSource : Source {
+-		public ChildWatchSource (Pid pid);
+-	}
+-
+-	namespace ChildWatch {
+-		[Version (since = "2.4")]
+-		[CCode (cname = "g_child_watch_add_full")]
+-		public static uint add (Pid pid, owned ChildWatchFunc function, [CCode (pos = 0.1)] int priority = Priority.DEFAULT_IDLE);
+-		[Version (since = "2.4")]
+-		public static uint add_full (int priority, Pid pid, owned ChildWatchFunc function);
+-	}
+-
+-	public struct PollFD {
+-		public int fd;
+-		public IOCondition events;
+-		public IOCondition revents;
+-	}
+-
+-	[Compact]
+-	[CCode (ref_function = "g_source_ref", unref_function = "g_source_unref")]
+-	public abstract class Source {
+-		protected Source ();
+-		[Version (since = "2.12")]
+-		public void set_funcs (SourceFuncs funcs);
+-		public uint attach (MainContext? context = null);
+-		public void destroy ();
+-		[Version (since = "2.12")]
+-		public bool is_destroyed ();
+-		public void set_priority (int priority);
+-		public int get_priority ();
+-		public void set_can_recurse (bool can_recurse);
+-		public bool get_can_recurse ();
+-		public uint get_id ();
+-		[Version (since = "2.26")]
+-		public unowned string? get_name ();
+-		[Version (since = "2.26")]
+-		public void set_name (string? name);
+-		[Version (since = "2.26")]
+-		public static void set_name_by_id (uint tag, string? name);
+-		public unowned MainContext get_context ();
+-		public void set_callback (owned SourceFunc func);
+-		public void set_callback_indirect (void* callback_data, SourceCallbackFuncs callback_funcs);
+-		[Version (since = "2.36")]
+-		public void* add_unix_fd (int fd, IOCondition events);
+-		[Version (since = "2.36")]
+-		public void remove_unix_fd (void* tag);
+-		[Version (since = "2.36")]
+-		public void modify_unix_fd (void* tag, IOCondition new_events);
+-		[Version (since = "2.36")]
+-		public IOCondition query_unix_fd (void* tag);
+-		public void add_poll (ref PollFD fd);
+-		public void remove_poll (ref PollFD fd);
+-		[Version (since = "2.28")]
+-		public void add_child_source (Source child_source);
+-		[Version (since = "2.28")]
+-		public void remove_child_source (Source child_source);
+-		[Version (since = "2.28")]
+-		public int64 get_time ();
+-		[Version (deprecated_since = "2.28", replacement = "get_time")]
+-		public void get_current_time (out TimeVal timeval);
+-		[Version (since = "2.36")]
+-		public void set_ready_time (int64 ready_time);
+-		public int64 get_ready_time ();
+-		public static bool remove (uint id);
+-		public static bool remove_by_funcs_user_data (void* user_data);
+-		public static bool remove_by_user_data (void* user_data);
+-		[Version (since = "2.32")]
+-		[CCode (cname = "G_SOURCE_CONTINUE")]
+-		public const bool CONTINUE;
+-		[Version (since = "2.32")]
+-		[CCode (cname = "G_SOURCE_REMOVE")]
+-		public const bool REMOVE;
+-
+-		protected abstract bool prepare (out int timeout_);
+-		protected abstract bool check ();
+-		protected abstract bool dispatch (SourceFunc? _callback);
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate void SourceDummyMarshal ();
+-
+-	[CCode (has_target = false)]
+-	public delegate bool SourcePrepareFunc (Source source, out int timeout_);
+-	[CCode (has_target = false)]
+-	public delegate bool SourceCheckFunc (Source source);
+-	[CCode (has_target = false)]
+-	public delegate bool SourceDispatchFunc (Source source, SourceFunc? _callback);
+-	[CCode (has_target = false)]
+-	public delegate void SourceFinalizeFunc (Source source);
+-
+-	public struct SourceFuncs {
+-		public SourcePrepareFunc prepare;
+-		public SourceCheckFunc check;
+-		public SourceDispatchFunc dispatch;
+-		public SourceFinalizeFunc finalize;
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate void SourceCallbackRefFunc (void* cb_data);
+-	[CCode (has_target = false)]
+-	public delegate void SourceCallbackUnrefFunc (void* cb_data);
+-	[CCode (has_target = false)]
+-	public delegate void SourceCallbackGetFunc (void* cb_data, Source source, SourceFunc func);
+-
+-	[Compact]
+-	public class SourceCallbackFuncs {
+-		public SourceCallbackRefFunc @ref;
+-		public SourceCallbackUnrefFunc unref;
+-		public SourceCallbackGetFunc @get;
+-	}
+-
+-	public delegate bool SourceFunc ();
+-
+-	public errordomain ThreadError {
+-		AGAIN;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	/* Thread support */
+-
+-	[CCode (scope = "async")]
+-	public delegate G ThreadFunc<G> ();
+-	public delegate void Func<G> (G data);
+-
+-	[Version (since = "2.36")]
+-	public uint get_num_processors ();
+-
+-	[CCode (has_type_id = false)]
+-	public enum ThreadPriority {
+-		LOW,
+-		NORMAL,
+-		HIGH,
+-		URGENT
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.32")]
+-	[CCode (ref_function = "g_thread_ref", unref_function = "g_thread_unref")]
+-	public class Thread<T> {
+-		[Version (since = "2.32")]
+-		public Thread (string? name, owned ThreadFunc<T> func);
+-		[Version (since = "2.32")]
+-		[CCode (cname = "g_thread_try_new")]
+-		public Thread.try (string? name, owned ThreadFunc<T> func) throws GLib.Error;
+-		public static bool supported ();
+-		[Version (deprecated_since = "2.32", replacement = "new Thread<T> ()")]
+-		[CCode (simple_generics = true)]
+-		public static unowned Thread<T> create<T> (owned ThreadFunc<T> func, bool joinable) throws ThreadError;
+-		[Version (deprecated_since = "2.32", replacement = "new Thread<T> ()")]
+-		[CCode (simple_generics = true)]
+-		public static unowned Thread<T> create_full<T> (owned ThreadFunc<T> func, ulong stack_size, bool joinable, bool bound, ThreadPriority priority) throws ThreadError;
+-		[CCode (simple_generics = true)]
+-		public static unowned Thread<T> self<T> ();
+-		[DestroysInstance]
+-		public T join ();
+-		[Version (deprecated_since = "2.32")]
+-		public void set_priority (ThreadPriority priority);
+-		public static void yield ();
+-		public static void exit (T retval);
+-		[Version (deprecated_since = "2.32", since = "2.10")]
+-		public static void @foreach (Func<Thread> thread_func);
+-
+-		[CCode (cname = "g_usleep")]
+-		public static void usleep (ulong microseconds);
+-	}
+-
+-	[Version (since = "2.32")]
+-	[CCode (destroy_function = "g_mutex_clear", lvalue_access = false)]
+-	public struct Mutex {
+-		public Mutex ();
+-		public void @lock ();
+-		public bool trylock ();
+-		public void unlock ();
+-	}
+-
+-	[Version (since = "2.44")]
+-	[CCode (destroy_function = "g_mutex_locker_free")]
+-	public struct MutexLocker {
+-		public MutexLocker (Mutex mutex);
+-		public void free ();
+-	}
+-
+-	[Version (since = "2.32")]
+-	[CCode (destroy_function = "g_rec_mutex_clear")]
+-	public struct RecMutex {
+-		public RecMutex ();
+-		public void lock ();
+-		public bool trylock ();
+-		public void unlock ();
+-	}
+-
+-	[Version (since = "2.32")]
+-	[CCode (destroy_function = "g_rw_lock_clear")]
+-	public struct RWLock {
+-		public RWLock ();
+-		public void writer_lock ();
+-		public bool writer_trylock ();
+-		public void writer_unlock ();
+-		public void reader_lock ();
+-		public bool reader_trylock ();
+-		public void reader_unlock ();
+-	}
+-
+-	[Version (deprecated_since = "2.32", replacement = "Mutex")]
+-	[CCode (destroy_function = "g_static_mutex_free", default_value = "G_STATIC_MUTEX_INIT")]
+-	public struct StaticMutex {
+-		public StaticMutex ();
+-		public void lock ();
+-		public bool trylock ();
+-		public void unlock ();
+-		public void lock_full ();
+-	}
+-
+-	[Version (deprecated_since = "2.32", replacement = "RecMutex")]
+-	[CCode (destroy_function = "g_static_rec_mutex_free", default_value = "G_STATIC_REC_MUTEX_INIT")]
+-	public struct StaticRecMutex {
+-		public StaticRecMutex ();
+-		public void lock ();
+-		public bool trylock ();
+-		public void unlock ();
+-		public void lock_full ();
+-	}
+-
+-	[Version (deprecated_since = "2.32", replacement = "RWLock")]
+-	[CCode (destroy_function = "g_static_rw_lock_free", default_value = "G_STATIC_RW_LOCK_INIT")]
+-	public struct StaticRWLock {
+-		public StaticRWLock ();
+-		public void reader_lock ();
+-		public bool reader_trylock ();
+-		public void reader_unlock ();
+-		public void writer_lock ();
+-		public bool writer_trylock ();
+-		public void writer_unlock ();
+-	}
+-
+-	[Compact]
+-	[CCode (ref_function = "", unref_function = "")]
+-	public class Private {
+-		public Private (DestroyNotify? destroy_func = null);
+-		public void* get ();
+-		public void set (void* data);
+-		public void replace (void* data);
+-	}
+-
+-	[CCode (destroy_function = "g_static_private_free", default_value = "G_STATIC_PRIVATE_INIT")]
+-	[Version (deprecated_since = "2.32")]
+-	public struct StaticPrivate {
+-		public StaticPrivate ();
+-		public void* get ();
+-		public void set (void* data, DestroyNotify? destroy_func);
+-	}
+-
+-	[Version (since = "2.32")]
+-	[CCode (destroy_function = "g_cond_clear", lvalue_access = false)]
+-	public struct Cond {
+-		public Cond ();
+-		public void @signal ();
+-		public void broadcast ();
+-		public void wait (Mutex mutex);
+-		[Version (deprecated_since = "2.32", replacement = "wait_until")]
+-		public bool timed_wait (Mutex mutex, TimeVal abs_time);
+-		[Version (since = "2.32")]
+-		public bool wait_until (Mutex mutex, int64 end_time);
+-	}
+-
+-	[CCode (cname = "GThreadFunc")]
+-	public delegate G OnceFunc<G> ();
+-
+-	[Version (since = "2.4")]
+-	[CCode (default_value = "G_ONCE_INIT")]
+-	public struct Once<G> {
+-		[CCode (cname = "g_once")]
+-		public unowned G once (OnceFunc<G> function);
+-		[Version (since = "2.14")]
+-		public static bool init_enter ([CCode (type="volatile gsize *")] size_t *value);
+-		[Version (since = "2.14")]
+-		public static void init_leave ([CCode (type="volatile gsize *")] size_t *value, size_t set_value);
+-		public OnceStatus status;
+-	}
+-
+-	[CCode (cprefix = "G_ONCE_STATUS_", has_type_id = false)]
+-	public enum OnceStatus {
+-		NOTCALLED,
+-		PROGRESS,
+-		READY
+-	}
+-
+-	/* Thread Pools */
+-
+-	[CCode (cname = "GFunc")]
+-	public delegate void ThreadPoolFunc<G> (owned G data);
+-
+-	[Compact]
+-	[CCode (free_function = "g_thread_pool_free")]
+-	public class ThreadPool<T> {
+-		[Version (deprecated_since = "vala-0.18", replacement = "ThreadPool.with_owned_data")]
+-		public ThreadPool (Func<T> func, int max_threads, bool exclusive) throws ThreadError;
+-		[CCode (cname = "g_thread_pool_new")]
+-		public ThreadPool.with_owned_data (ThreadPoolFunc<T> func, int max_threads, bool exclusive) throws ThreadError;
+-		[Version (deprecated_since = "vala-0.18", replacement = "add")]
+-		public void push (T data) throws ThreadError;
+-		[CCode (cname = "g_thread_pool_push")]
+-		public void add (owned T data) throws ThreadError;
+-		public void set_max_threads (int max_threads) throws ThreadError;
+-		public int get_max_threads ();
+-		public uint get_num_threads ();
+-		[Version (since = "2.46")]
+-		public bool move_to_front (T data);
+-		public uint unprocessed ();
+-		[CCode (cname = "g_thread_pool_free")]
+-		void _free (bool immediate, bool wait);
+-		[CCode (cname = "vala__g_thread_pool_free_wrapper")]
+-		public static void free (owned ThreadPool? pool, bool immediate, bool wait) {
+-			ThreadPool* ptr = (owned) pool;
+-			if (ptr != null) {
+-				((ThreadPool)ptr)._free (immediate, wait);
+-			}
+-		}
+-		public static void set_max_unused_threads (int max_threads);
+-		public static int get_max_unused_threads ();
+-		public static uint get_num_unused_threads ();
+-		public static void stop_unused_threads ();
+-		[Version (since = "2.10")]
+-		public void set_sort_function (CompareDataFunc<T> func);
+-		[Version (since = "2.10")]
+-		public static void set_max_idle_time (uint interval);
+-		[Version (since = "2.10")]
+-		public static uint get_max_idle_time ();
+-	}
+-
+-	/* Asynchronous Queues */
+-
+-	[Compact]
+-	[CCode (ref_function = "g_async_queue_ref", unref_function = "g_async_queue_unref")]
+-	public class AsyncQueue<G> {
+-		[Version (since = "2.16")]
+-		[CCode (cname = "g_async_queue_new_full", simple_generics = true)]
+-		public AsyncQueue ();
+-		public void push (owned G data);
+-		[Version (since = "2.10")]
+-		public void push_sorted (owned G data, CompareDataFunc<G> func);
+-		public G pop ();
+-		public G? try_pop ();
+-		public G? timed_pop (ref TimeVal end_time);
+-		public int length ();
+-		[Version (since = "2.10")]
+-		public void sort (CompareDataFunc<G> func);
+-		public void @lock ();
+-		public void unlock ();
+-		public void ref_unlocked ();
+-		public void unref_and_unlock ();
+-		[Version (since = "2.46")]
+-		public void push_front (owned G data);
+-		[Version (since = "2.46")]
+-		public void push_front_unlocked (owned G data);
+-		public void push_unlocked (owned G data);
+-		[Version (since = "2.10")]
+-		public void push_sorted_unlocked (owned G data, CompareDataFunc<G> func);
+-		public G pop_unlocked ();
+-		[Version (since = "2.46")]
+-		public bool remove (G data);
+-		[Version (since = "2.46")]
+-		public bool remove_unlocked (G data);
+-		public G? try_pop_unlocked ();
+-		public G? timed_pop_unlocked (ref TimeVal end_time);
+-		public G? timeout_pop (uint64 timeout);
+-		public G? timeout_pop_unlocked (uint64 timeout);
+-		public int length_unlocked ();
+-		public void sort_unlocked (CompareDataFunc<G> func);
+-	}
+-
+-	/* Memory Allocation */
+-
+-	public static void* malloc (size_t n_bytes);
+-	public static void* malloc0 (size_t n_bytes);
+-	public static void* realloc (void* mem, size_t n_bytes);
+-
+-	public static void* try_malloc (size_t n_bytes);
+-	[Version (since = "2.8")]
+-	public static void* try_malloc0 (size_t n_bytes);
+-	public static void* try_realloc (void* mem, size_t n_bytes);
+-
+-	public static void free (void* mem);
+-
+-	public class MemVTable {
+-	}
+-
+-	[CCode (cname = "glib_mem_profiler_table")]
+-	public static MemVTable mem_profiler_table;
+-
+-	public static void mem_set_vtable (MemVTable vtable);
+-	public static void mem_profile ();
+-
+-	[CCode (cheader_filename = "string.h")]
+-	namespace Memory {
+-		[CCode (cname = "memcmp")]
+-		public static int cmp (void* s1, void* s2, size_t n);
+-		[CCode (cname = "memcpy")]
+-		public static void* copy (void* dest, void* src, size_t n);
+-		[CCode (cname = "memset")]
+-		public static void* set (void* dest, int src, size_t n);
+-		[CCode (cname = "g_memmove")]
+-		public static void* move (void* dest, void* src, size_t n);
+-		[CCode (cname = "g_memdup")]
+-		public static void* dup (void* mem, uint n);
+-	}
+-
+-	[Version (since = "2.10")]
+-	namespace Slice {
+-		public static void* alloc (size_t block_size);
+-		public static void* alloc0 (size_t block_size);
+-		[Version (since = "2.14")]
+-		public static void* copy (size_t block_size, void* mem_block);
+-		[CCode (cname = "g_slice_free1")]
+-		public static void free (size_t block_size, void* mem_block);
+-		public static void free_chain_with_offset (size_t block_size, void *mem_chain, size_t next_offset);
+-		public static int64 get_config (SliceConfig ckey);
+-		[CCode (array_length_cname = "n_values", array_length_type = "guint")]
+-		public static int64[] get_config_state (SliceConfig ckey, int64 address);
+-		public static void set_config (SliceConfig ckey, int64 value);
+-	}
+-
+-	[CCode (cprefix = "G_SLICE_CONFIG_", has_type_id = false)]
+-	public enum SliceConfig {
+-		ALWAYS_MALLOC,
+-		BYPASS_MAGAZINES,
+-		WORKING_SET_MSECS,
+-		COLOR_INCREMENT,
+-		CHUNK_SIZES,
+-		CONTENTION_COUNTER
+-	}
+-
+-	/* IO Channels */
+-
+-	[Compact]
+-	[CCode (ref_function = "g_io_channel_ref", unref_function = "g_io_channel_unref")]
+-	public class IOChannel {
+-		[CCode (cname = "g_io_channel_unix_new")]
+-		public IOChannel.unix_new (int fd);
+-		public int unix_get_fd ();
+-		[CCode (cname = "g_io_channel_win32_new_fd")]
+-		public IOChannel.win32_new_fd (int fd);
+-		[CCode (cname = "g_io_channel_win32_new_socket")]
+-		public IOChannel.win32_socket (int socket);
+-		[CCode (cname = "g_io_channel_win32_new_messages")]
+-		public IOChannel.win32_messages (size_t hwnd);
+-		public void init ();
+-		public IOChannel.file (string filename, string mode) throws FileError;
+-		public IOStatus read_chars (char[] buf, out size_t bytes_read) throws ConvertError, IOChannelError;
+-		public IOStatus read_unichar (out unichar thechar) throws ConvertError, IOChannelError;
+-		public IOStatus read_line (out string str_return, out size_t length, out size_t terminator_pos) throws ConvertError, IOChannelError;
+-		public IOStatus read_line_string (StringBuilder buffer, out size_t terminator_pos) throws ConvertError, IOChannelError;
+-		public IOStatus read_to_end (out string str_return, out size_t length) throws ConvertError, IOChannelError;
+-		public IOStatus write_chars (char[] buf, out size_t bytes_written) throws ConvertError, IOChannelError;
+-		public IOStatus write_unichar (unichar thechar) throws ConvertError, IOChannelError;
+-		public IOStatus flush () throws IOChannelError;
+-		public IOStatus seek_position (int64 offset, SeekType type) throws IOChannelError;
+-		public IOStatus shutdown (bool flush) throws IOChannelError;
+-		[CCode (cname = "g_io_create_watch")]
+-		public IOSource create_watch (IOCondition condition);
+-		[CCode (cname = "g_io_add_watch")]
+-		public uint add_watch (IOCondition condition, IOFunc func);
+-		[CCode (cname = "g_io_add_watch_full")]
+-		public uint add_watch_full (int priority, IOCondition condition, owned IOFunc func);
+-		public size_t get_buffer_size ();
+-		public void set_buffer_size (size_t size);
+-		public IOCondition get_buffer_condition ();
+-		public IOFlags get_flags ();
+-		public IOStatus set_flags (IOFlags flags) throws IOChannelError;
+-		public unowned string get_line_term (out int length);
+-		public void set_line_term (string line_term, int length);
+-		public bool get_buffered ();
+-		public void set_buffered (bool buffered);
+-		public unowned string get_encoding ();
+-		public IOStatus set_encoding (string? encoding) throws IOChannelError;
+-		public bool get_close_on_unref ();
+-		public void set_close_on_unref (bool do_close);
+-	}
+-
+-	[Compact]
+-	[CCode (cname = "GSource")]
+-	public class IOSource : Source {
+-		[CCode (cname = "g_io_create_watch")]
+-		public IOSource (IOChannel channel, IOCondition condition);
+-		[CCode (cname = "g_source_set_callback")]
+-		public void set_callback ([CCode (type = "GSourceFunc")] owned IOFunc func);
+-	}
+-
+-	[CCode (cprefix = "G_SEEK_", has_type_id = false)]
+-	public enum SeekType {
+-		CUR,
+-		SET,
+-		END
+-	}
+-
+-	[CCode (has_type_id = false)]
+-	public enum IOStatus {
+-		ERROR,
+-		NORMAL,
+-		EOF,
+-		AGAIN
+-	}
+-
+-	public errordomain IOChannelError {
+-		FBIG,
+-		INVAL,
+-		IO,
+-		ISDIR,
+-		NOSPC,
+-		NXIO,
+-		OVERFLOW,
+-		PIPE,
+-		FAILED;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[Flags]
+-	[CCode (cprefix = "G_IO_")]
+-	public enum IOCondition {
+-		IN,
+-		OUT,
+-		PRI,
+-		ERR,
+-		HUP,
+-		NVAL
+-	}
+-
+-	public delegate bool IOFunc (IOChannel source, IOCondition condition);
+-
+-	[CCode (cprefix = "G_IO_FLAG_", has_type_id = false)]
+-	[Flags]
+-	public enum IOFlags {
+-		APPEND,
+-		NONBLOCK,
+-		IS_READABLE,
+-		IS_WRITABLE,
+-		IS_WRITEABLE,
+-		IS_SEEKABLE,
+-		MASK,
+-		GET_MASK,
+-		SET_MASK
+-	}
+-
+-	/* Error Reporting */
+-
+-	[Compact]
+-	[ErrorBase]
+-	[CCode (copy_function = "g_error_copy", free_function = "g_error_free")]
+-	public class Error {
+-		[PrintfFormat]
+-		public Error (Quark domain, int code, string format, ...);
+-		public Error.literal (Quark domain, int code, string message);
+-		[PrintfFormat]
+-		public Error.valist (Quark domain, int code, string format, va_list args);
+-		public Error copy ();
+-		public bool matches (Quark domain, int code);
+-		[CCode (cname = "g_prefix_error")]
+-		public static void prefix (out Error? dest, string format, ...);
+-		[CCode (cname = "g_propagate_error")]
+-		public static void propagate (out Error? dest, owned Error src);
+-		[CCode (cname = "g_propagate_prefixed_error")]
+-		public static void propagate_prefixed (out Error? dest, owned Error src, string format, ...);
+-		[CCode (cname = "g_set_error")]
+-		public static void @set (out Error? dest, Quark domain, int code, string format, ...);
+-		[CCode (cname = "g_set_error_literal")]
+-		public static void set_literal (out Error? dest, Quark domain, int code, string message);
+-
+-		public Quark domain;
+-		public int code;
+-		public string message;
+-	}
+-
+-	/* Message Output and Debugging Functions */
+-
+-	[PrintfFormat]
+-	public static void print (string format, ...);
+-	public static void set_print_handler (PrintFunc func);
+-	[CCode (has_target = false)]
+-	public delegate void PrintFunc (string text);
+-	[PrintfFormat]
+-	public static void printerr (string format, ...);
+-	public static void set_printerr_handler (PrintFunc func);
+-
+-	public static void return_if_fail (bool expr);
+-	[CCode (sentinel = "")]
+-	public static void return_val_if_fail (bool expr, ...);
+-	[NoReturn]
+-	public static void return_if_reached ();
+-	[NoReturn]
+-	[CCode (sentinel = "")]
+-	public static void return_val_if_reached (...);
+-	[Version (since = "2.16")]
+-	public static void warn_if_fail (bool expr);
+-	[Version (since = "2.16")]
+-	public static void warn_if_reached ();
+-
+-	[Assert]
+-	public static void assert (bool expr);
+-	[Assert]
+-	[Version (since = "2.46")]
+-	public static void assert_cmpmem (uint8[] m1, uint8[] m2);
+-	[Assert]
+-	public static void assert_error (Error? error, Quark error_domain, int error_code);
+-	[Assert]
+-	[Version (since = "2.38")]
+-	public static void assert_false (bool expr);
+-	[Assert]
+-	[Version (since = "2.38")]
+-	public static void assert_true (bool expr);
+-	[Assert]
+-	[Version (since = "2.38")]
+-	public static void assert_null (void* expr);
+-	[Assert]
+-	public static void assert_no_error (Error? error);
+-	[Assert]
+-	[Version (since = "2.40")]
+-	public static void assert_nonnull (void* expr);
+-	[NoReturn]
+-	public static void assert_not_reached ();
+-
+-	public static void on_error_query (string? prg_name = null);
+-	public static void on_error_stack_trace (string? prg_name = null);
+-	[CCode (cname = "G_BREAKPOINT")]
+-	public static void breakpoint ();
+-
+-	/* Message Logging */
+-
+-	[CCode (cprefix = "G_LOG_", has_type_id = false)]
+-	[Flags]
+-	public enum LogLevelFlags {
+-		/* log flags */
+-		FLAG_RECURSION,
+-		FLAG_FATAL,
+-
+-		/* GLib log levels */
+-		LEVEL_ERROR,
+-		LEVEL_CRITICAL,
+-		LEVEL_WARNING,
+-		LEVEL_MESSAGE,
+-		LEVEL_INFO,
+-		LEVEL_DEBUG,
+-
+-		LEVEL_MASK
+-	}
+-
+-	[CCode (cprefix = "G_LOG_WRITER_", has_type_id = false)]
+-	[Version (since = "2.50")]
+-	public enum LogWriterOutput {
+-		HANDLED,
+-		UNHANDLED
+-	}
+-
+-	[CCode (has_type_id = false, simple_generics = true)]
+-	[Version (since = "2.50")]
+-	public struct LogField<T> {
+-		public unowned string key;
+-		public unowned T @value;
+-		public ssize_t length;
+-	}
+-
+-	public void logv (string? log_domain, LogLevelFlags log_level, string format, va_list args);
+-	[Diagnostics]
+-	[PrintfFormat]
+-	public void log (string? log_domain, LogLevelFlags log_level, string format, ...);
+-
+-	[Version (since = "2.50")]
+-	public void log_structured (string? log_domain, LogLevelFlags log_levels, ...);
+-	[Version (since = "2.50")]
+-	public void log_structured_array (LogLevelFlags log_levels, LogField[] fields);
+-
+-	[Version (since = "2.50")]
+-	public void log_variant (string? log_domain, LogLevelFlags log_levels, GLib.Variant fields);
+-
+-	[Diagnostics]
+-	[PrintfFormat]
+-	public void message (string format, ...);
+-	[Diagnostics]
+-	[PrintfFormat]
+-	public void warning (string format, ...);
+-	[Diagnostics]
+-	[PrintfFormat]
+-	public void critical (string format, ...);
+-	[Diagnostics]
+-	[PrintfFormat]
+-	[NoReturn]
+-	public void error (string format, ...);
+-	[Diagnostics]
+-	[PrintfFormat]
+-	[Version (since = "2.6")]
+-	public void debug (string format, ...);
+-	[Diagnostics]
+-	[PrintfFormat]
+-	[Version (since = "2.40")]
+-	public void info (string format, ...);
+-	[CCode (cname = "G_DEBUG_HERE")]
+-	[Version (since = "2.50")]
+-	public void debug_here ();
+-
+-	public delegate void LogFunc (string? log_domain, LogLevelFlags log_levels, string message);
+-	[Version (since = "2.50")]
+-	public delegate LogWriterOutput LogWriterFunc (LogLevelFlags log_level, LogField[] fields);
+-
+-	namespace Log {
+-		public static uint set_handler (string? log_domain, LogLevelFlags log_levels, LogFunc log_func);
+-		[Version (since = "2.46")]
+-		public static void set_handler_full (string? log_domain, LogLevelFlags log_levels, owned LogFunc log_func);
+-		[Version (since = "2.6")]
+-		public static void set_default_handler (LogFunc log_func);
+-		[CCode (delegate_target = false)]
+-		public static GLib.LogFunc default_handler;
+-		public static LogLevelFlags set_fatal_mask (string log_domain, LogLevelFlags log_levels);
+-		public static LogLevelFlags set_always_fatal (LogLevelFlags log_levels);
+-		public static void remove_handler (string? log_domain, uint handler_id);
+-
+-		public const string FILE;
+-		public const int LINE;
+-		public const string METHOD;
+-
+-		[Version (since = "2.50")]
+-		public static void set_writer_func (owned LogWriterFunc func);
+-		[Version (since = "2.50")]
+-		public static bool writer_supports_color (int output_fd);
+-		[Version (since = "2.50")]
+-		public static bool writer_is_journald (int output_fd);
+-		[Version (since = "2.50")]
+-		public static string writer_format_fields (LogLevelFlags log_levels, LogField[] fields, bool use_color);
+-		[Version (since = "2.50")]
+-		public static LogWriterOutput writer_journald (LogLevelFlags log_levels, LogField[] fields, void* user_data);
+-		[Version (since = "2.50")]
+-		public static LogWriterOutput writer_standard_streams (LogLevelFlags log_levels, LogField[] fields, void* user_data);
+-		[Version (since = "2.50")]
+-		public static LogWriterOutput writer_default (LogLevelFlags log_levels, LogField[] fields, void* user_data);
+-	}
+-
+-	[CCode (has_type_id = false)]
+-	public struct DebugKey {
+-		unowned string key;
+-		uint value;
+-	}
+-
+-	public uint parse_debug_string (string? debug_string, DebugKey[] keys);
+-
+-	/* String Utility Functions */
+-
+-	public string strdup (string str);
+-	[CCode (array_length = false, array_null_terminated = true)]
+-	public string[] strdupv ([CCode (array_length = false, array_null_terminated = true)] string[] str_array);
+-
+-	public void strfreev (string** str_array);
+-	[Version (since = "2.6")]
+-	public uint strv_length ([CCode (array_length = false, array_null_terminated = true)] string[] str_array);
+-	[Version (since = "2.44")]
+-	public bool strv_contains ([CCode (array_length = false, array_null_terminated = true)] string[] str_array, string str);
+-
+-	[CCode (cname = "errno", cheader_filename = "errno.h")]
+-	public int errno;
+-	public unowned string strerror (int errnum);
+-
+-	/* Character Set Conversions */
+-
+-	public static string convert (string str, ssize_t len, string to_codeset, string from_codeset, out size_t bytes_read = null, out size_t bytes_written = null) throws ConvertError;
+-	public static string convert_with_fallback (string str, ssize_t len, string to_codeset, string from_codeset, string? fallback = null, out size_t bytes_read = null, out size_t bytes_written = null) throws ConvertError;
+-	public static string convert_with_iconv (string str, ssize_t len, IConv converter, out size_t bytes_read = null, out size_t bytes_written = null) throws ConvertError;
+-	public static bool get_charset (out unowned string charset);
+-	public static bool get_filename_charsets ([CCode (array_length = false, array_null_terminated = true)] out unowned string[] charsets);
+-
+-	[SimpleType]
+-	public struct IConv {
+-		public static IConv open (string to_codeset, string from_codeset);
+-		[CCode (cname = "g_iconv")]
+-		public size_t iconv ([CCode (array_length = false)] ref char[] inbuf, ref size_t inbytes_left, [CCode (array_length = false)] ref char[] outbuf, ref size_t outbytes_left);
+-		public int close ();
+-	}
+-
+-	namespace Filename {
+-		public static string to_utf8 (string opsysstring, ssize_t len, out size_t bytes_read, out size_t bytes_written) throws ConvertError;
+-		public static string from_utf8 (string utf8string, ssize_t len, out size_t bytes_read, out size_t bytes_written) throws ConvertError;
+-		public static string from_uri (string uri, out string hostname = null) throws ConvertError;
+-		public static string to_uri (string filename, string? hostname = null) throws ConvertError;
+-		[Version (since = "2.6")]
+-		public static string display_name (string filename);
+-		[Version (since = "2.6")]
+-		public static string display_basename (string filename);
+-		[Version (cname = "g_canonicalize_filename", since = "2.58")]
+-		public static string canonicalize (string filename, string? relative_to = null);
+-	}
+-
+-	public errordomain ConvertError {
+-		NO_CONVERSION,
+-		ILLEGAL_SEQUENCE,
+-		FAILED,
+-		PARTIAL_INPUT,
+-		BAD_URI,
+-		NOT_ABSOLUTE_PATH;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	/* Base64 Encoding */
+-
+-	[Version (since = "2.12")]
+-	namespace Base64 {
+-		public static size_t encode_step (uchar[] _in, bool break_lines, char* _out, ref int state, ref int save);
+-		public static size_t encode_close (bool break_lines, char* _out, ref int state, ref int save);
+-		public static string encode (uchar[] data);
+-		public static size_t decode_step (char[] _in, uchar* _out, ref int state, ref uint save);
+-		[CCode (array_length_type = "size_t")]
+-		public static uchar[] decode (string text);
+-	}
+-
+-	/* Data Checksums */
+-
+-	[Version (since = "2.16")]
+-	[CCode (cprefix = "G_CHECKSUM_", has_type_id = false)]
+-	public enum ChecksumType {
+-		MD5,
+-		SHA1,
+-		SHA256,
+-		[Version (since = "2.52")]
+-		SHA384,
+-		[Version (since = "2.36")]
+-		SHA512;
+-
+-		public ssize_t get_length ();
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.16")]
+-	[CCode (free_function = "g_checksum_free")]
+-	public class Checksum {
+-		public Checksum (ChecksumType checksum_type);
+-		public Checksum copy ();
+-		public void update ([CCode (array_length = false)] uchar[] data, size_t length);
+-		public unowned string get_string ();
+-		public void get_digest ([CCode (array_length = false)] uint8[] buffer, ref size_t digest_len);
+-		[CCode (cname = "g_compute_checksum_for_data")]
+-		public static string compute_for_data (ChecksumType checksum_type, uchar[] data);
+-		[CCode (cname = "g_compute_checksum_for_string")]
+-		public static string compute_for_string (ChecksumType checksum_type, string str, size_t length = -1);
+-		[Version (since = "2.34")]
+-		[CCode (cname = "g_compute_checksum_for_bytes")]
+-		public static string compute_for_bytes (ChecksumType checksum_type, Bytes data);
+-	}
+-
+-	/* Secure HMAC Digests */
+-
+-	[Compact]
+-	[Version (since = "2.30")]
+-	[CCode (ref_function = "g_hmac_ref", unref_function = "g_hmac_unref")]
+-	public class Hmac {
+-		public Hmac (ChecksumType digest_type, [CCode (array_length_type = "gsize")] uint8[] key);
+-		public Hmac copy ();
+-		public void update ([CCode (array_length_type = "gssize")] uint8[] data);
+-		public unowned string get_string ();
+-		public void get_digest ([CCode (array_length = false)] uint8[] buffer, ref size_t digest_len);
+-		[Version (since = "2.30")]
+-		[CCode (cname = "g_compute_hmac_for_data")]
+-		public static string compute_for_data (ChecksumType checksum_type, uint8[] key, uint8[] data);
+-		[Version (since = "2.30")]
+-		[CCode (cname = "g_compute_hmac_for_string")]
+-		public static string compute_for_string (ChecksumType checksum_type, uint8[] key, string str, size_t length = -1);
+-		[Version (since = "2.50")]
+-		[CCode (cname = "g_compute_hmac_for_bytes")]
+-		public static string compute_hmac_for_bytes (ChecksumType checksum_type, Bytes key, Bytes data);
+-	}
+-
+-	/* Date and Time Functions */
+-
+-	[CCode (has_type_id = false)]
+-	public struct TimeVal {
+-		public long tv_sec;
+-		public long tv_usec;
+-
+-		[CCode (cname = "g_get_current_time")]
+-		public TimeVal ();
+-		[CCode (cname = "g_get_current_time")]
+-		public void get_current_time ();
+-		public void add (long microseconds);
+-		[Version (since = "2.12")]
+-		[CCode (instance_pos = -1)]
+-		public bool from_iso8601 (string iso_date);
+-		[Version (since = "2.12")]
+-		public string to_iso8601 ();
+-	}
+-
+-	[Version (since = "2.28")]
+-	public static int64 get_monotonic_time ();
+-	[Version (since = "2.28")]
+-	public static int64 get_real_time ();
+-
+-	public struct DateDay : uchar {
+-		[CCode (cname = "G_DATE_BAD_DAY")]
+-		public static DateDay BAD_DAY;
+-
+-		[CCode (cname = "g_date_valid_day")]
+-		public bool valid ();
+-	}
+-
+-	[CCode (cprefix = "G_DATE_", has_type_id = false)]
+-	public enum DateMonth {
+-		BAD_MONTH,
+-		JANUARY,
+-		FEBRUARY,
+-		MARCH,
+-		APRIL,
+-		MAY,
+-		JUNE,
+-		JULY,
+-		AUGUST,
+-		SEPTEMBER,
+-		OCTOBER,
+-		NOVEMBER,
+-		DECEMBER;
+-
+-		[CCode (cname = "g_date_get_days_in_month")]
+-		public uchar get_days_in_month (DateYear year);
+-		[CCode (cname = "g_date_valid_month")]
+-		public bool valid ();
+-	}
+-
+-	public struct DateYear : ushort {
+-		[CCode (cname = "G_DATE_BAD_YEAR")]
+-		public static DateDay BAD_YEAR;
+-
+-		[CCode (cname = "g_date_is_leap_year")]
+-		public bool is_leap_year ();
+-		[CCode (cname = "g_date_get_monday_weeks_in_year")]
+-		public uchar get_monday_weeks_in_year ();
+-		[CCode (cname = "g_date_get_sunday_weeks_in_year")]
+-		public uchar get_sunday_weeks_in_year ();
+-		[CCode (cname = "g_date_valid_year")]
+-		public bool valid ();
+-	}
+-
+-	[CCode (cprefix = "G_DATE_", has_type_id = false)]
+-	public enum DateWeekday {
+-		BAD_WEEKDAY,
+-		MONDAY,
+-		TUESDAY,
+-		WEDNESDAY,
+-		THURSDAY,
+-		FRIDAY,
+-		SATURDAY,
+-		SUNDAY;
+-
+-		[CCode (cname = "g_date_valid_weekday")]
+-		public bool valid ();
+-	}
+-
+-	[CCode (cprefix = "G_DATE_", has_type_id = false)]
+-	public enum DateDMY {
+-		DAY,
+-		MONTH,
+-		YEAR
+-	}
+-
+-	[CCode (type_id = "G_TYPE_DATE")]
+-	public struct Date {
+-		public void clear (uint n_dates = 1);
+-		[Version (since = "2.56")]
+-		public Date copy ();
+-		public void set_day (DateDay day);
+-		public void set_month (DateMonth month);
+-		public void set_year (DateYear year);
+-		public void set_dmy (DateDay day, int month, DateYear y);
+-		public void set_julian (uint julian_day);
+-		[Version (since = "2.10")]
+-		public void set_time_t (time_t timet);
+-		[Version (since = "2.10")]
+-		public void set_time_val (TimeVal timeval);
+-		public void set_parse (string str);
+-		public void add_days (uint n_days);
+-		public void subtract_days (uint n_days);
+-		public void add_months (uint n_months);
+-		public void subtract_months (uint n_months);
+-		public void add_years (uint n_years);
+-		public void subtract_years (uint n_years);
+-		public int days_between (Date date2);
+-		public int compare (Date rhs);
+-		public void clamp (Date min_date, Date max_date);
+-		public void order (Date date2);
+-		public DateDay get_day ();
+-		public DateMonth get_month ();
+-		public DateYear get_year ();
+-		public uint get_julian ();
+-		public DateWeekday get_weekday ();
+-		public uint get_day_of_year ();
+-		public bool is_first_of_month ();
+-		public bool is_last_of_month ();
+-		public uint get_monday_week_of_year ();
+-		public uint get_sunday_week_of_year ();
+-		[Version (since = "2.6")]
+-		public uint get_iso8601_week_of_year ();
+-		[CCode (instance_pos = -1)]
+-		public size_t strftime (char[] s, string format);
+-		[CCode (cname = "g_date_to_struct_tm")]
+-		public void to_time (out Time tm);
+-		public bool valid ();
+-		public static uchar get_days_in_month (DateMonth month, DateYear year);
+-		public static bool valid_day (DateDay day);
+-		public static bool valid_dmy (DateDay day, DateMonth month, DateYear year);
+-		public static bool valid_julian (uint julian_date);
+-		public static bool valid_weekday (DateWeekday weekday);
+-	}
+-
+-	[CCode (cname = "struct tm", cheader_filename = "time.h", has_type_id = false)]
+-	public struct Time {
+-		[CCode (cname = "tm_sec")]
+-		public int second;
+-		[CCode (cname = "tm_min")]
+-		public int minute;
+-		[CCode (cname = "tm_hour")]
+-		public int hour;
+-		[CCode (cname = "tm_mday")]
+-		public int day;
+-		[CCode (cname = "tm_mon")]
+-		public int month;
+-		[CCode (cname = "tm_year")]
+-		public int year;
+-		[CCode (cname = "tm_wday")]
+-		public int weekday;
+-		[CCode (cname = "tm_yday")]
+-		public int day_of_year;
+-		[CCode (cname = "tm_isdst")]
+-		public int isdst;
+-
+-		[CCode (cname = "gmtime_r", feature_test_macro = "_XOPEN_SOURCE")]
+-		static void gmtime_r (ref time_t time, out Time result);
+-		[CCode (cname = "localtime_r", feature_test_macro = "_XOPEN_SOURCE")]
+-		static void localtime_r (ref time_t time, out Time result);
+-
+-		public static Time gm (time_t time) {
+-			Time result;
+-			gmtime_r (ref time, out result);
+-			return result;
+-		}
+-		public static Time local (time_t time) {
+-			Time result;
+-			localtime_r (ref time, out result);
+-			return result;
+-		}
+-
+-		public string to_string () {
+-			return "%04d-%02d-%02d %02d:%02d:%02d".printf (year + 1900, month + 1, day, hour, minute, second);
+-		}
+-
+-		public string format (string format) {
+-			var buffer = new char[64];
+-			this.strftime (buffer, format);
+-			return (string) buffer;
+-		}
+-
+-		[CCode (cname = "mktime")]
+-		public time_t mktime ();
+-
+-		[CCode (cname = "strftime", instance_pos = -1)]
+-		public size_t strftime (char[] s, string format);
+-		[CCode (cname = "strptime", instance_pos = -1, feature_test_macro = "_XOPEN_SOURCE")]
+-		public unowned string? strptime (string buf, string format);
+-	}
+-
+-	[SimpleType]
+-	[Version (since = "2.26")]
+-	[CCode (cheader_filename = "glib.h", type_id = "G_TYPE_INT64", marshaller_type_name = "INT64", get_value_function = "g_value_get_int64", set_value_function = "g_value_set_int64", default_value = "0LL", type_signature = "x")]
+-	[IntegerType (rank = 10)]
+-	public struct TimeSpan : int64 {
+-		public const TimeSpan DAY;
+-		public const TimeSpan HOUR;
+-		public const TimeSpan MINUTE;
+-		public const TimeSpan SECOND;
+-		public const TimeSpan MILLISECOND;
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.26")]
+-	[CCode (ref_function = "g_date_time_ref", unref_function = "g_date_time_unref", type_id = "G_TYPE_DATE_TIME")]
+-	public class DateTime {
+-		public DateTime.now (TimeZone tz = new TimeZone.local ());
+-		public DateTime.now_local ();
+-		public DateTime.now_utc ();
+-		[Version (since = "2.56")]
+-		public DateTime.from_iso8601 (string text, TimeZone default_tz);
+-		public DateTime.from_unix_local (int64 t);
+-		public DateTime.from_unix_utc (int64 t);
+-		public DateTime.from_timeval_local (TimeVal tv);
+-		public DateTime.from_timeval_utc (TimeVal tv);
+-		public DateTime (TimeZone tz, int year, int month, int day, int hour, int minute, double seconds);
+-		public DateTime.local (int year, int month, int day, int hour, int minute, double seconds);
+-		public DateTime.utc (int year, int month, int day, int hour, int minute, double seconds);
+-		public DateTime add (TimeSpan timespan);
+-		public DateTime add_years (int years);
+-		public DateTime add_months (int months);
+-		public DateTime add_weeks (int weeks);
+-		public DateTime add_days (int days);
+-		public DateTime add_hours (int hours);
+-		public DateTime add_minutes (int minutes);
+-		public DateTime add_seconds (double seconds);
+-		public DateTime add_full (int years, int months, int days, int hours = 0, int minutes = 0, double seconds = 0);
+-		public int compare (DateTime dt);
+-		public TimeSpan difference (DateTime begin);
+-		public uint hash ();
+-		public bool equal (DateTime dt);
+-		public void get_ymd (out int year, out int month, out int day);
+-		public int get_year ();
+-		public int get_month ();
+-		public int get_day_of_month ();
+-		public int get_week_numbering_year ();
+-		public int get_week_of_year ();
+-		public int get_day_of_week ();
+-		public int get_day_of_year ();
+-		public int get_hour ();
+-		public int get_minute ();
+-		public int get_second ();
+-		public int get_microsecond ();
+-		public double get_seconds ();
+-		[Version (since = "2.58")]
+-		public unowned TimeZone get_timezone ();
+-		public int64 to_unix ();
+-		public bool to_timeval (out TimeVal tv);
+-		public TimeSpan get_utc_offset ();
+-		public unowned string get_timezone_abbreviation ();
+-		public bool is_daylight_savings ();
+-		public DateTime to_timezone (TimeZone tz);
+-		public DateTime to_local ();
+-		public DateTime to_utc ();
+-		public string format (string format);
+-		public string to_string () {
+-			return this.format ("%FT%H:%M:%S%z");
+-		}
+-	}
+-
+-	public enum TimeType {
+-		STANDARD,
+-		DAYLIGHT,
+-		UNIVERSAL
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.26")]
+-	[CCode (ref_function = "g_time_zone_ref", unref_function = "g_time_zone_unref")]
+-	public class TimeZone {
+-		public TimeZone (string identifier);
+-		public TimeZone.utc ();
+-		public TimeZone.local ();
+-		[Version (since = "2.58")]
+-		public TimeZone.offset (int32 seconds);
+-		public int find_interval (TimeType type, int64 time);
+-		public int adjust_time (TimeType type, ref int64 time);
+-		public unowned string get_abbreviation (int interval);
+-		[Version (since = "2.58")]
+-		public unowned string get_identifier ();
+-		public int32 get_offset (int interval);
+-		public bool is_dst (int interval);
+-	}
+-
+-	/* Random Numbers */
+-
+-	[Compact]
+-	[CCode (copy_function = "g_rand_copy", free_function = "g_rand_free")]
+-	public class Rand {
+-		public Rand.with_seed (uint32 seed);
+-		[Version (since = "2.4")]
+-		public Rand.with_seed_array ([CCode (array_length = false)] uint32[] seed, uint seed_length);
+-		public Rand ();
+-		public void set_seed (uint32 seed);
+-		[Version (since = "2.4")]
+-		public void set_seed_array ([CCode (array_length = false)] uint32[] seed, uint seed_length);
+-		public bool boolean ();
+-		[CCode (cname = "g_rand_int")]
+-		public uint32 next_int ();
+-		public int32 int_range (int32 begin, int32 end);
+-		[CCode (cname = "g_rand_double")]
+-		public double next_double ();
+-		public double double_range (double begin, double end);
+-	}
+-
+-	namespace Random {
+-		public static void set_seed (uint32 seed);
+-		public static bool boolean ();
+-		[CCode (cname = "g_random_int")]
+-		public static uint32 next_int ();
+-		public static int32 int_range (int32 begin, int32 end);
+-		[CCode (cname = "g_random_double")]
+-		public static double next_double ();
+-		public static double double_range (double begin, double end);
+-	}
+-
+-	namespace Uuid {
+-		[Version (since = "2.52")]
+-		public static bool string_is_valid (string str);
+-		[Version (since = "2.52")]
+-		public static string string_random ();
+-	}
+-
+-	/* Miscellaneous Utility Functions */
+-
+-	namespace Environment {
+-		[Version (since = "2.2")]
+-		[CCode (cname = "g_get_application_name")]
+-		public static unowned string? get_application_name ();
+-		[Version (since = "2.2")]
+-		[CCode (cname = "g_set_application_name")]
+-		public static void set_application_name (string application_name);
+-		[CCode (cname = "g_get_prgname")]
+-		public static unowned string get_prgname ();
+-		[CCode (cname = "g_set_prgname")]
+-		public static void set_prgname (string application_name);
+-		[CCode (cname = "g_getenv")]
+-		public static unowned string? get_variable (string variable);
+-		[Version (since = "2.4")]
+-		[CCode (cname = "g_setenv")]
+-		public static bool set_variable (string variable, string value, bool overwrite);
+-		[Version (since = "2.4")]
+-		[CCode (cname = "g_unsetenv")]
+-		public static void unset_variable (string variable);
+-		[Version (since = "2.8")]
+-		[CCode (cname = "g_listenv", array_length = false, array_null_terminated = true)]
+-		public static string[] list_variables ();
+-		[CCode (cname = "g_get_user_name")]
+-		public static unowned string get_user_name ();
+-		[CCode (cname = "g_get_real_name")]
+-		public static unowned string get_real_name ();
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_get_user_cache_dir")]
+-		public static unowned string get_user_cache_dir ();
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_get_user_data_dir")]
+-		public static unowned string get_user_data_dir ();
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_get_user_config_dir")]
+-		public static unowned string get_user_config_dir ();
+-		[CCode (cname = "g_get_user_runtime_dir")]
+-		public static unowned string get_user_runtime_dir ();
+-		[Version (since = "2.14")]
+-		[CCode (cname = "g_get_user_special_dir")]
+-		public static unowned string get_user_special_dir (UserDirectory directory);
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_get_system_data_dirs", array_length = false, array_null_terminated = true)]
+-		public static unowned string[] get_system_data_dirs ();
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_get_system_config_dirs", array_length = false, array_null_terminated = true)]
+-		public static unowned string[] get_system_config_dirs ();
+-		[Version (since = "2.8")]
+-		[CCode (cname = "g_get_host_name")]
+-		public static unowned string get_host_name ();
+-		[CCode (cname = "g_get_home_dir")]
+-		public static unowned string get_home_dir ();
+-		[CCode (cname = "g_get_tmp_dir")]
+-		public static unowned string get_tmp_dir ();
+-		[CCode (cname = "g_get_current_dir")]
+-		public static string get_current_dir ();
+-		[CCode (cname = "g_find_program_in_path")]
+-		public static string? find_program_in_path (string program);
+-		[Version (deprecated_since = "2.32")]
+-		[CCode (cname = "g_atexit")]
+-		public static void atexit (VoidFunc func);
+-		[Version (since = "2.8")]
+-		[CCode (cname = "g_chdir")]
+-		public static int set_current_dir (string path);
+-	}
+-
+-	namespace Environ {
+-		[Version (since = "2.28")]
+-		[CCode (cname = "g_get_environ", array_length = false, array_null_terminated = true)]
+-		public static string[] get ();
+-		[Version (since = "2.32")]
+-		[CCode (cname = "g_environ_getenv")]
+-		public static unowned string? get_variable ([CCode (array_length = false, array_null_terminated = true)] string[]? envp, string variable);
+-		[Version (since = "2.32")]
+-		[CCode (cname = "g_environ_setenv", array_length = false, array_null_terminated = true)]
+-		public static string[] set_variable ([CCode (array_length = false, array_null_terminated = true)] owned string[]? envp, string variable, string value, bool overwrite = true);
+-		[Version (since = "2.32")]
+-		[CCode (cname = "g_environ_unsetenv", array_length = false, array_null_terminated = true)]
+-		public static string[] unset_variable ([CCode (array_length = false, array_null_terminated = true)] owned string[]? envp, string variable);
+-	}
+-
+-	[Version (since = "2.14")]
+-	[CCode (has_type_id = false)]
+-	public enum UserDirectory {
+-		DESKTOP,
+-		DOCUMENTS,
+-		DOWNLOAD,
+-		MUSIC,
+-		PICTURES,
+-		PUBLIC_SHARE,
+-		TEMPLATES,
+-		VIDEOS,
+-		[CCode (cname = "G_USER_N_DIRECTORIES")]
+-		N_DIRECTORIES
+-	}
+-
+-	namespace Hostname {
+-		public static bool is_non_ascii (string hostname);
+-		public static bool is_ascii_encoded (string hostname);
+-		public static bool is_ip_address (string hostname);
+-		public static string to_ascii (string hostname);
+-		public static string to_unicode (string hostname);
+-	}
+-
+-	namespace Path {
+-		public static bool is_absolute (string file_name);
+-		public static unowned string skip_root (string file_name);
+-		public static string get_basename (string file_name);
+-		public static string get_dirname (string file_name);
+-		[CCode (cname = "g_build_filename")]
+-		public static string build_filename (string first_element, ...);
+-		[Version (since = "2.56")]
+-		[CCode (cname = "g_build_filename_valist")]
+-		public static string build_filename_valist (string first_element, va_list args);
+-		[CCode (cname = "g_build_path")]
+-		public static string build_path (string separator, string first_element, ...);
+-
+-		[CCode (cname = "G_DIR_SEPARATOR")]
+-		public const char DIR_SEPARATOR;
+-		[CCode (cname = "G_DIR_SEPARATOR_S")]
+-		public const string DIR_SEPARATOR_S;
+-		[Version (since = "2.6")]
+-		[CCode (cname = "G_IS_DIR_SEPARATOR")]
+-		public static bool is_dir_separator (unichar c);
+-		[CCode (cname = "G_SEARCHPATH_SEPARATOR")]
+-		public const char SEARCHPATH_SEPARATOR;
+-		[CCode (cname = "G_SEARCHPATH_SEPARATOR_S")]
+-		public const string SEARCHPATH_SEPARATOR_S;
+-	}
+-
+-	namespace Bit {
+-		public static int nth_lsf (ulong mask, int nth_bit);
+-		public static int nth_msf (ulong mask, int nth_bit);
+-		public static uint storage (ulong number);
+-	}
+-
+-	namespace SpacedPrimes {
+-		public static uint closest (uint num);
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate void FreeFunc (void* data);
+-	[CCode (has_target = false)]
+-	public delegate void VoidFunc ();
+-
+-	[Version (deprecated_since = "2.30", replacement = "format_size", since = "2.16")]
+-	public string format_size_for_display (int64 size);
+-
+-	[Version (since = "2.30")]
+-	[CCode (cname = "g_format_size_full")]
+-	public string format_size (uint64 size, FormatSizeFlags flags = FormatSizeFlags.DEFAULT);
+-
+-	[Version (since = "2.30")]
+-	[CCode (cprefix = "G_FORMAT_SIZE_", has_type_id = false)]
+-	[Flags]
+-	public enum FormatSizeFlags {
+-		DEFAULT,
+-		LONG_FORMAT,
+-		IEC_UNITS
+-	}
+-
+-	/* Lexical Scanner */
+-	[CCode (has_target = false)]
+-	public delegate void ScannerMsgFunc (Scanner scanner, string message, bool error);
+-
+-	[Compact]
+-	[CCode (free_function = "g_scanner_destroy")]
+-	public class Scanner {
+-		public unowned string input_name;
+-		public TokenType token;
+-		public TokenValue value;
+-		public uint line;
+-		public uint position;
+-		public TokenType next_token;
+-		public TokenValue next_value;
+-		public uint next_line;
+-		public uint next_position;
+-		public ScannerMsgFunc msg_handler;
+-		public ScannerConfig? config;
+-		public Scanner (ScannerConfig? config_templ);
+-		public void input_file (int input_fd);
+-		public void sync_file_offset ();
+-		public void input_text (string text, uint text_len);
+-		public TokenType peek_next_token ();
+-		public TokenType get_next_token ();
+-		public bool eof ();
+-		public int cur_line ();
+-		public int cur_position ();
+-		public TokenType cur_token ();
+-		public TokenValue cur_value ();
+-		public uint set_scope (uint scope_id);
+-		public void scope_add_symbol (uint scope_id, string symbol, void* value);
+-		public void scope_foreach_symbol (uint scope_id, HFunc<string, void*> func);
+-		public void* scope_lookup_symbol (uint scope_id, string symbol);
+-		public void scope_remove_symbol (uint scope_id, string symbol);
+-		public void* lookup_symbol (string symbol);
+-		[PrintfFormat]
+-		public void warn (string format, ...);
+-		[PrintfFormat]
+-		public void error (string format, ...);
+-		public void unexp_token (TokenType expected_token, string? identifier_spec, string? symbol_spec, string? symbol_name, string? message, bool is_error);
+-	}
+-
+-	public struct ScannerConfig {
+-		public string* cset_skip_characters;
+-		public string* cset_identifier_first;
+-		public string* cset_identifier_nth;
+-		public string* cpair_comment_single;
+-		public bool case_sensitive;
+-		public bool skip_comment_multi;
+-		public bool skip_comment_single;
+-		public bool scan_comment_multi;
+-		public bool scan_identifier;
+-		public bool scan_identifier_1char;
+-		public bool scan_identifier_NULL;
+-		public bool scan_symbols;
+-		public bool scan_binary;
+-		public bool scan_octal;
+-		public bool scan_float;
+-		public bool scan_hex;
+-		public bool scan_hex_dollar;
+-		public bool scan_string_sq;
+-		public bool scan_string_dq;
+-		public bool numbers_2_int;
+-		public bool int_2_float;
+-		public bool identifier_2_string;
+-		public bool char_2_token;
+-		public bool symbol_2_token;
+-		public bool scope_0_fallback;
+-		public bool store_int64;
+-	}
+-
+-	[CCode (lower_case_cprefix="G_CSET_")]
+-	namespace CharacterSet {
+-		public const string A_2_Z;
+-		public const string a_2_z;
+-		public const string DIGITS;
+-		public const string LATINC;
+-		public const string LATINS;
+-	}
+-
+-	[CCode (cprefix = "G_TOKEN_", has_type_id = false)]
+-	public enum TokenType {
+-		EOF,
+-		LEFT_PAREN,
+-		RIGHT_PAREN,
+-		LEFT_CURLY,
+-		RIGHT_CURLY,
+-		LEFT_BRACE,
+-		RIGHT_BRACE,
+-		EQUAL_SIGN,
+-		COMMA,
+-		NONE,
+-		ERROR,
+-		CHAR,
+-		BINARY,
+-		OCTAL,
+-		INT,
+-		HEX,
+-		FLOAT,
+-		STRING,
+-		SYMBOL,
+-		IDENTIFIER,
+-		IDENTIFIER_NULL,
+-		COMMENT_SINGLE,
+-		COMMENT_MULTI,
+-		LAST
+-	}
+-
+-	[SimpleType]
+-	public struct TokenValue {
+-		[CCode (cname="v_symbol")]
+-		public void* symbol;
+-		[CCode (cname="v_identifier")]
+-		public unowned string identifier;
+-		[CCode (cname="v_binary")]
+-		public ulong binary;
+-		[CCode (cname="v_octal")]
+-		public ulong octal;
+-		[CCode (cname="v_int")]
+-		public ulong int;
+-		[CCode (cname="v_int64")]
+-		public ulong int64;
+-		[CCode (cname="v_float")]
+-		public double float;
+-		[CCode (cname="v_hex")]
+-		public ulong hex;
+-		[CCode (cname="v_string")]
+-		public unowned string string;
+-		[CCode (cname="v_comment")]
+-		public unowned string comment;
+-		[CCode (cname="v_char")]
+-		public uchar char;
+-		[CCode (cname="v_error")]
+-		public uint error;
+-	}
+-
+-	[CCode (cprefix = "G_ERR_", has_type_id = false)]
+-	public enum ErrorType {
+-		UNKNOWN,
+-		UNEXP_EOF,
+-		UNEXP_EOF_IN_STRING,
+-		UNEXP_EOF_IN_COMMENT,
+-		NON_DIGIT_IN_CONST,
+-		DIGIT_RADIX,
+-		FLOAT_RADIX,
+-		FLOAT_MALFORMED
+-	}
+-
+-	/* Automatic String Completion */
+-
+-	[Version (deprecated_since = "2.26")]
+-	[Compact]
+-	[CCode (free_function = "g_completion_free")]
+-	public class Completion {
+-		public Completion (CompletionFunc? func = null);
+-		public List<void*> items;
+-		public CompletionFunc func;
+-		public string prefix;
+-		public List<void*> cache;
+-		public CompletionStrncmpFunc strncmp_func;
+-		public void add_items (List<void*> items);
+-		public void remove_items (List<void*> items);
+-		public void clear_items ();
+-		public unowned List<void*> complete (string prefix, out string? new_prefix = null);
+-		[Version (since = "2.4")]
+-		public unowned List<void*> complete_utf8 (string prefix, out string? new_prefix = null);
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate string CompletionFunc (void* item);
+-	[CCode (has_target = false)]
+-	public delegate int CompletionStrncmpFunc (string s1, string s2, size_t n);
+-
+-	/* Timers */
+-
+-	[Compact]
+-	[CCode (free_function = "g_timer_destroy")]
+-	public class Timer {
+-		public Timer ();
+-		public void start ();
+-		public void stop ();
+-		[Version (since = "2.4")]
+-		public void @continue ();
+-		public double elapsed (out ulong microseconds = null);
+-		public void reset ();
+-	}
+-
+-	/* Spawning Processes */
+-
+-	public errordomain SpawnError {
+-		FORK,
+-		READ,
+-		CHDIR,
+-		ACCES,
+-		PERM,
+-		TOO_BIG,
+-		NOEXEC,
+-		NAMETOOLONG,
+-		NOENT,
+-		NOMEM,
+-		NOTDIR,
+-		LOOP,
+-		TXTBUSY,
+-		IO,
+-		NFILE,
+-		MFILE,
+-		INVAL,
+-		ISDIR,
+-		LIBBAD,
+-		FAILED;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[CCode (cprefix = "G_SPAWN_", has_type_id = false)]
+-	[Flags]
+-	public enum SpawnFlags {
+-		LEAVE_DESCRIPTORS_OPEN,
+-		DO_NOT_REAP_CHILD,
+-		SEARCH_PATH,
+-		STDOUT_TO_DEV_NULL,
+-		STDERR_TO_DEV_NULL,
+-		CHILD_INHERITS_STDIN,
+-		FILE_AND_ARGV_ZERO,
+-		SEARCH_PATH_FROM_ENVP
+-	}
+-
+-	public delegate void SpawnChildSetupFunc ();
+-	[CCode (has_target = false, cheader_filename = "signal.h")]
+-	public delegate void SignalHandlerFunc (int signum);
+-
+-	public unowned string strsignal (int signum);
+-
+-	[CCode (lower_case_cprefix = "g_")]
+-	namespace Process {
+-		[Version (since = "2.58")]
+-		public static bool spawn_async_with_fds (string? working_directory, [CCode (array_length = false, array_null_terminated = true)] string[] argv, [CCode (array_length = false, array_null_terminated = true)] string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, out Pid child_pid = null, int stdin_fd = -1, int stdout_fd = -1, int stderr_fd = -1) throws SpawnError;
+-		public static bool spawn_async_with_pipes (string? working_directory, [CCode (array_length = false, array_null_terminated = true)] string[] argv, [CCode (array_length = false, array_null_terminated = true)] string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, out Pid child_pid, out int standard_input = null, out int standard_output = null, out int standard_error = null) throws SpawnError;
+-		public static bool spawn_async (string? working_directory, [CCode (array_length = false, array_null_terminated = true)] string[] argv, [CCode (array_length = false, array_null_terminated = true)] string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, out Pid child_pid) throws SpawnError;
+-		public static bool spawn_sync (string? working_directory, [CCode (array_length = false, array_null_terminated = true)] string[] argv, [CCode (array_length = false, array_null_terminated = true)] string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, out string standard_output = null, out string standard_error = null, out int exit_status = null) throws SpawnError;
+-		public static bool spawn_command_line_async (string command_line) throws SpawnError;
+-		public static bool spawn_command_line_sync (string command_line, out string standard_output = null, out string standard_error = null, out int exit_status = null) throws SpawnError;
+-		[CCode (cname = "g_spawn_close_pid")]
+-		public static void close_pid (Pid pid);
+-		[Version (since = "2.34")]
+-		[CCode (cname = "g_spawn_check_exit_status")]
+-		public static bool check_exit_status (int exit_status) throws GLib.Error;
+-
+-		/* these macros are required to examine the exit status of a process */
+-		[CCode (cname = "WIFEXITED", cheader_filename = "sys/wait.h")]
+-		public static bool if_exited (int status);
+-		[CCode (cname = "WEXITSTATUS", cheader_filename = "sys/wait.h")]
+-		public static int exit_status (int status);
+-		[CCode (cname = "WIFSIGNALED", cheader_filename = "sys/wait.h")]
+-		public static bool if_signaled (int status);
+-		[CCode (cname = "WTERMSIG", cheader_filename = "sys/wait.h")]
+-		public static ProcessSignal term_sig (int status);
+-		[CCode (cname = "WCOREDUMP", cheader_filename = "sys/wait.h")]
+-		public static bool core_dump (int status);
+-		[CCode (cname = "WIFSTOPPED", cheader_filename = "sys/wait.h")]
+-		public static bool if_stopped (int status);
+-		[CCode (cname = "WSTOPSIG", cheader_filename = "sys/wait.h")]
+-		public static ProcessSignal stop_sig (int status);
+-		[CCode (cname = "WIFCONTINUED", cheader_filename = "sys/wait.h")]
+-		public static bool if_continued (int status);
+-
+-		[NoReturn]
+-		[CCode (cname = "abort", cheader_filename = "stdlib.h")]
+-		public void abort ();
+-		[NoReturn]
+-		[CCode (cname = "exit", cheader_filename = "stdlib.h")]
+-		public void exit (int status);
+-		[CCode (cname = "raise", cheader_filename = "signal.h")]
+-		public int raise (ProcessSignal sig);
+-		[CCode (cname = "signal", cheader_filename = "signal.h")]
+-		public SignalHandlerFunc @signal (ProcessSignal signum, SignalHandlerFunc handler);
+-	}
+-
+-	[CCode (cname = "int", has_type_id = false, cheader_filename = "signal.h", cprefix = "SIG")]
+-	public enum ProcessSignal {
+-		HUP,
+-		INT,
+-		QUIT,
+-		ILL,
+-		TRAP,
+-		ABRT,
+-		BUS,
+-		FPE,
+-		KILL,
+-		SEGV,
+-		PIPE,
+-		ALRM,
+-		TERM,
+-		USR1,
+-		USR2,
+-		CHLD,
+-		CONT,
+-		STOP,
+-		TSTP,
+-		TTIN,
+-		TTOU
+-	}
+-
+-
+-	/* File Utilities */
+-
+-	public errordomain FileError {
+-		EXIST,
+-		ISDIR,
+-		ACCES,
+-		NAMETOOLONG,
+-		NOENT,
+-		NOTDIR,
+-		NXIO,
+-		NODEV,
+-		ROFS,
+-		TXTBSY,
+-		FAULT,
+-		LOOP,
+-		NOSPC,
+-		NOMEM,
+-		MFILE,
+-		NFILE,
+-		BADF,
+-		INVAL,
+-		PIPE,
+-		AGAIN,
+-		INTR,
+-		IO,
+-		PERM,
+-		NOSYS,
+-		FAILED;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[CCode (has_type_id = false)]
+-	[Flags]
+-	public enum FileTest {
+-		IS_REGULAR,
+-		IS_SYMLINK,
+-		IS_DIR,
+-		IS_EXECUTABLE,
+-		EXISTS
+-	}
+-
+-	[CCode (cname = "int", cprefix = "SEEK_", has_type_id = false)]
+-	public enum FileSeek {
+-		SET,
+-		CUR,
+-		END
+-	}
+-
+-	[Compact]
+-	[CCode (cname = "FILE", free_function = "fclose", cheader_filename = "stdio.h")]
+-	public class FileStream {
+-		[CCode (cname = "EOF", cheader_filename = "stdio.h")]
+-		public const int EOF;
+-
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_fopen", cheader_filename = "glib/gstdio.h")]
+-		public static FileStream? open (string path, string mode);
+-		[CCode (cname = "fdopen")]
+-		public static FileStream? fdopen (int fildes, string mode);
+-		[CCode (cname = "fprintf")]
+-		[PrintfFormat ()]
+-		public void printf (string format, ...);
+-		[CCode (cname = "vfprintf")]
+-		public void vprintf (string format, va_list args);
+-		[CCode (cname = "fputc", instance_pos = -1)]
+-		public void putc (char c);
+-		[CCode (cname = "fputs", instance_pos = -1)]
+-		public void puts (string s);
+-		[CCode (cname = "fgetc")]
+-		public int getc ();
+-		[CCode (cname = "ungetc", instance_pos = -1)]
+-		public int ungetc (int c);
+-		[CCode (cname = "fgets", instance_pos = -1)]
+-		public unowned string? gets (char[] s);
+-		[CCode (cname = "feof")]
+-		public bool eof ();
+-		[CCode (cname = "fscanf"), ScanfFormat]
+-		public int scanf (string format, ...);
+-		[CCode (cname = "fflush")]
+-		public int flush ();
+-		[CCode (cname = "fseek")]
+-		public int seek (long offset, FileSeek whence);
+-		[CCode (cname = "ftell")]
+-		public long tell ();
+-		[CCode (cname = "rewind")]
+-		public void rewind ();
+-		[CCode (cname = "fileno")]
+-		public int fileno ();
+-		[CCode (cname = "ferror")]
+-		public int error ();
+-		[CCode (cname = "clearerr")]
+-		public void clearerr ();
+-		[CCode (cname = "fread", instance_pos = -1)]
+-		public size_t read ([CCode (array_length_pos = 2.1)] uint8[] buf, size_t size = 1);
+-		[CCode (cname = "fwrite", instance_pos = -1)]
+-		public size_t write ([CCode (array_length_pos = 2.1)] uint8[] buf, size_t size = 1);
+-
+-		public string? read_line () {
+-			int c;
+-			StringBuilder? ret = null;
+-			while ((c = getc ()) != EOF) {
+-				if (ret == null) {
+-					ret = new StringBuilder ();
+-				}
+-				if (c == '\n') {
+-					break;
+-				}
+-				((!)(ret)).append_c ((char) c);
+-			}
+-			if (ret == null) {
+-				return null;
+-			} else {
+-				return ((!)(ret)).str;
+-			}
+-		}
+-	}
+-
+-	[CCode (cname = "struct utimbuf", cheader_filename = "sys/types.h,utime.h")]
+-	public struct UTimBuf {
+-		time_t actime;       /* access time */
+-		time_t modtime;      /* modification time */
+-	}
+-
+-	[CCode (lower_case_cprefix = "g_file_", cheader_filename = "glib/gstdio.h")]
+-	namespace FileUtils {
+-		public static bool get_contents (string filename, out string contents, out size_t length = null) throws FileError;
+-		[Version (since = "2.8")]
+-		public static bool set_contents (string filename, string contents, ssize_t length = -1) throws FileError;
+-		[CCode (cname = "g_file_get_contents")]
+-		public static bool get_data (string filename, [CCode (type = "gchar**", array_length_type = "size_t")] out uint8[] contents) throws FileError;
+-		[CCode (cname = "g_file_set_contents")]
+-		public static bool set_data (string filename, [CCode (type = "const char*", array_length_type = "size_t")] uint8[] contents) throws FileError;
+-		public static bool test (string filename, FileTest test);
+-		public static int open_tmp (string tmpl, out string name_used) throws FileError;
+-		[Version (since = "2.4")]
+-		public static string read_link (string filename) throws FileError;
+-		public static int error_from_errno (int err_no);
+-
+-		[CCode (cname = "g_mkstemp")]
+-		public static int mkstemp (string tmpl);
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_rename")]
+-		public static int rename (string oldfilename, string newfilename);
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_remove")]
+-		public static int remove (string filename);
+-		[CCode (cname = "g_unlink")]
+-		public static int unlink (string filename);
+-		[Version (since = "2.8")]
+-		[CCode (cname = "g_chmod")]
+-		public static int chmod (string filename, int mode);
+-		[Version (since = "2.18")]
+-		[CCode (cname = "g_utime")]
+-		public static int utime (string filename, UTimBuf? times = null);
+-
+-		[CCode (cname = "symlink", cheader_filename = "unistd.h")]
+-		public static int symlink (string oldpath, string newpath);
+-
+-		[CCode (cname = "close", cheader_filename = "unistd.h")]
+-		public static int close (int fd);
+-
+-		[Version (since = "2.36")]
+-		[CCode (cname = "g_close")]
+-		public static bool close_checked (int fd) throws FileError;
+-	}
+-
+-	[CCode (cname = "struct stat", cheader_filename = "sys/stat.h,glib/gstdio.h")]
+-	public struct Stat {
+-		public time_t st_atime;
+-		public time_t st_mtime;
+-		public time_t st_ctime;
+-		[CCode (cname = "g_stat", instance_pos = -1)]
+-		public Stat (string filename);
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_lstat", instance_pos = -1)]
+-		public Stat.l (string filename);
+-	}
+-
+-	[Compact]
+-	[CCode (free_function = "g_dir_close")]
+-	public class Dir {
+-		public static Dir open (string filename, uint _flags = 0) throws FileError;
+-		public unowned string? read_name ();
+-		public void rewind ();
+-	}
+-
+-	[CCode (cheader_filename = "glib/gstdio.h")]
+-	namespace DirUtils {
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_mkdir")]
+-		public static int create (string pathname, int mode);
+-		[Version (since = "2.8")]
+-		[CCode (cname = "g_mkdir_with_parents")]
+-		public static int create_with_parents (string pathname, int mode);
+-		[Version (since = "2.30")]
+-		[CCode (cname = "mkdtemp")]
+-		public static string mkdtemp (owned string template);
+-		[Version (since = "2.30")]
+-		[CCode (cname = "g_dir_make_tmp")]
+-		public static string make_tmp (string tmpl) throws FileError;
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_rmdir")]
+-		public static int remove (string filename);
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.22")]
+-	[CCode (ref_function = "g_mapped_file_ref", unref_function = "g_mapped_file_unref")]
+-	public class MappedFile {
+-		public MappedFile (string filename, bool writable) throws FileError;
+-		public size_t get_length ();
+-		public unowned char* get_contents ();
+-		[Version (since = "2.34")]
+-		public Bytes get_bytes ();
+-	}
+-
+-	[CCode (cname = "stdin", cheader_filename = "stdio.h")]
+-	public static FileStream stdin;
+-
+-	[CCode (cname = "stdout", cheader_filename = "stdio.h")]
+-	public static FileStream stdout;
+-
+-	[CCode (cname = "stderr", cheader_filename = "stdio.h")]
+-	public static FileStream stderr;
+-
+-	/* URI Functions */
+-
+-	namespace Uri {
+-		public const string RESERVED_CHARS_ALLOWED_IN_PATH;
+-		public const string RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT;
+-		public const string RESERVED_CHARS_ALLOWED_IN_USERINFO;
+-		public const string RESERVED_CHARS_GENERIC_DELIMITERS;
+-		public const string RESERVED_CHARS_SUBCOMPONENT_DELIMITERS;
+-
+-		[Version (since = "2.16")]
+-		public static string? parse_scheme (string uri);
+-		[Version (since = "2.16")]
+-		public static string escape_string (string unescaped, string? reserved_chars_allowed = null, bool allow_utf8 = true);
+-		[Version (since = "2.16")]
+-		public static string? unescape_string (string escaped_string, string? illegal_characters = null);
+-		[Version (since = "2.16")]
+-		public static string? unescape_segment (string? escaped_string, string? escaped_string_end, string? illegal_characters = null);
+-		[Version (since = "2.6")]
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public static string[] list_extract_uris (string uri_list);
+-	}
+-
+-	/* Shell-related Utilities */
+-
+-	public errordomain ShellError {
+-		BAD_QUOTING,
+-		EMPTY_STRING,
+-		FAILED;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	namespace Shell {
+-		public static bool parse_argv (string command_line, [CCode (array_length_pos = 1.9)] out string[] argvp) throws ShellError;
+-		public static string quote (string unquoted_string);
+-		public static string unquote (string quoted_string) throws ShellError;
+-	}
+-
+-	/* Commandline option parser */
+-
+-	public errordomain OptionError {
+-		UNKNOWN_OPTION,
+-		BAD_VALUE,
+-		FAILED;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.6")]
+-	[CCode (free_function = "g_option_context_free")]
+-	public class OptionContext {
+-		public OptionContext (string? parameter_string = null);
+-		[Version (since = "2.12")]
+-		public void set_summary (string summary);
+-		[Version (since = "2.12")]
+-		public unowned string get_summary ();
+-		[Version (since = "2.12")]
+-		public void set_description (string description);
+-		[Version (since = "2.12")]
+-		public unowned string get_description ();
+-		[Version (since = "2.12")]
+-		public void set_translate_func (TranslateFunc func, DestroyNotify? destroy_notify);
+-		[Version (since = "2.12")]
+-		public void set_translation_domain (string domain);
+-		public bool parse ([CCode (array_length_pos = 0.9)] ref unowned string[] argv) throws OptionError;
+-		[Version (since = "2.40")]
+-		public bool parse_strv ([CCode (array_length = false, array_null_terminated = true)] ref string[] argv) throws OptionError;
+-		public void set_help_enabled (bool help_enabled);
+-		public bool get_help_enabled ();
+-		public void set_ignore_unknown_options (bool ignore_unknown);
+-		public bool get_ignore_unknown_options ();
+-		[Version (since = "2.14")]
+-		public string get_help (bool main_help, OptionGroup? group);
+-		public void add_main_entries ([CCode (array_length = false, array_null_terminated = true)] OptionEntry[] entries, string? translation_domain);
+-		public void add_group (owned OptionGroup group);
+-		public void set_main_group (owned OptionGroup group);
+-		public unowned OptionGroup get_main_group ();
+-		[Version (since = "2.44")]
+-		public void set_strict_posix (bool strict_posix);
+-		[Version (since = "2.44")]
+-		public bool get_strict_posix ();
+-	}
+-
+-	public delegate unowned string TranslateFunc (string str);
+-
+-	public const string OPTION_REMAINING;
+-
+-	[CCode (has_type_id = false)]
+-	public enum OptionArg {
+-		NONE,
+-		STRING,
+-		INT,
+-		CALLBACK,
+-		FILENAME,
+-		STRING_ARRAY,
+-		FILENAME_ARRAY,
+-		DOUBLE,
+-		INT64
+-	}
+-
+-	[Flags]
+-	[CCode (cprefix = "G_OPTION_FLAG_", has_type_id = false)]
+-	public enum OptionFlags {
+-		[Version (since = "2.42")]
+-		NONE,
+-		HIDDEN,
+-		IN_MAIN,
+-		REVERSE,
+-		NO_ARG,
+-		FILENAME,
+-		OPTIONAL_ARG,
+-		NOALIAS
+-	}
+-
+-	public struct OptionEntry {
+-		public unowned string long_name;
+-		public char short_name;
+-		public int flags;
+-
+-		public OptionArg arg;
+-		public void* arg_data;
+-
+-		public unowned string description;
+-		public unowned string? arg_description;
+-	}
+-
+-	[Compact]
+-#if GLIB_2_44
+-	[Version (since = "2.44")]
+-	[CCode (ref_function = "g_option_group_ref", unref_function = "g_option_group_unref", type_id = "G_TYPE_OPTION_GROUP")]
+-#else
+-	[Version (since = "2.6")]
+-	[CCode (free_function = "g_option_group_free")]
+-#endif
+-	public class OptionGroup {
+-		public OptionGroup (string name, string description, string help_description, void* user_data = null, DestroyNotify? destroy = null);
+-		public void add_entries ([CCode (array_length = false, array_null_terminated = true)] OptionEntry[] entries);
+-		public void set_parse_hooks (OptionParseFunc? pre_parse_func, OptionParseFunc? post_parse_hook);
+-		public void set_error_hook (OptionErrorFunc? error_func);
+-		public void set_translate_func (owned TranslateFunc? func);
+-		public void set_translation_domain (string domain);
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate bool OptionParseFunc (OptionContext context, OptionGroup group, void* data) throws OptionError;
+-	[CCode (has_target = false)]
+-	public delegate void OptionErrorFunc (OptionContext context, OptionGroup group, void* data, ref Error error);
+-	[CCode (has_target = false)]
+-	public delegate bool OptionArgFunc (string option_name, string val, void* data) throws OptionError;
+-
+-	/* Perl-compatible regular expressions */
+-
+-	[Version (since = "2.14")]
+-	public errordomain RegexError {
+-		COMPILE,
+-		OPTIMIZE,
+-		REPLACE,
+-		MATCH,
+-		INTERNAL,
+-		STRAY_BACKSLASH,
+-		MISSING_CONTROL_CHAR,
+-		UNRECOGNIZED_ESCAPE,
+-		QUANTIFIERS_OUT_OF_ORDER,
+-		QUANTIFIER_TOO_BIG,
+-		UNTERMINATED_CHARACTER_CLASS,
+-		INVALID_ESCAPE_IN_CHARACTER_CLASS,
+-		RANGE_OUT_OF_ORDER,
+-		NOTHING_TO_REPEAT,
+-		UNRECOGNIZED_CHARACTER,
+-		POSIX_NAMED_CLASS_OUTSIDE_CLASS,
+-		UNMATCHED_PARENTHESIS,
+-		INEXISTENT_SUBPATTERN_REFERENCE,
+-		UNTERMINATED_COMMENT,
+-		EXPRESSION_TOO_LARGE,
+-		MEMORY_ERROR,
+-		VARIABLE_LENGTH_LOOKBEHIND,
+-		MALFORMED_CONDITION,
+-		TOO_MANY_CONDITIONAL_BRANCHES,
+-		ASSERTION_EXPECTED,
+-		UNKNOWN_POSIX_CLASS_NAME,
+-		POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED,
+-		HEX_CODE_TOO_LARGE,
+-		INVALID_CONDITION,
+-		SINGLE_BYTE_MATCH_IN_LOOKBEHIND,
+-		INFINITE_LOOP,
+-		MISSING_SUBPATTERN_NAME_TERMINATOR,
+-		DUPLICATE_SUBPATTERN_NAME,
+-		MALFORMED_PROPERTY,
+-		UNKNOWN_PROPERTY,
+-		SUBPATTERN_NAME_TOO_LONG,
+-		TOO_MANY_SUBPATTERNS,
+-		INVALID_OCTAL_VALUE,
+-		TOO_MANY_BRANCHES_IN_DEFINE,
+-		DEFINE_REPETION,
+-		INCONSISTENT_NEWLINE_OPTIONS,
+-		MISSING_BACK_REFERENCE,
+-		INVALID_RELATIVE_REFERENCE,
+-		BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN,
+-		UNKNOWN_BACKTRACKING_CONTROL_VERB,
+-		NUMBER_TOO_BIG,
+-		MISSING_SUBPATTERN_NAME,
+-		MISSING_DIGIT,
+-		INVALID_DATA_CHARACTER,
+-		EXTRA_SUBPATTERN_NAME,
+-		BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED,
+-		INVALID_CONTROL_CHAR,
+-		MISSING_NAME,
+-		NOT_SUPPORTED_IN_CLASS,
+-		TOO_MANY_FORWARD_REFERENCES,
+-		NAME_TOO_LONG,
+-		CHARACTER_VALUE_TOO_LARGE;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[Version (since = "2.14")]
+-	[CCode (cprefix = "G_REGEX_", has_type_id = false)]
+-	[Flags]
+-	public enum RegexCompileFlags {
+-		CASELESS,
+-		MULTILINE,
+-		DOTALL,
+-		EXTENDED,
+-		ANCHORED,
+-		DOLLAR_ENDONLY,
+-		UNGREEDY,
+-		RAW,
+-		NO_AUTO_CAPTURE,
+-		OPTIMIZE,
+-		DUPNAMES,
+-		NEWLINE_CR,
+-		NEWLINE_LF,
+-		NEWLINE_CRLF,
+-		NEWLINE_ANYCRLF,
+-		BSR_ANYCRLF,
+-		JAVASCRIPT_COMPAT
+-	}
+-
+-	[Version (since = "2.14")]
+-	[CCode (cprefix = "G_REGEX_MATCH_", has_type_id = false)]
+-	[Flags]
+-	public enum RegexMatchFlags {
+-		ANCHORED,
+-		NOTBOL,
+-		NOTEOL,
+-		NOTEMPTY,
+-		PARTIAL,
+-		NEWLINE_CR,
+-		NEWLINE_LF,
+-		NEWLINE_CRLF,
+-		NEWLINE_ANY,
+-		NEWLINE_ANYCRLF,
+-		BSR_ANYCRLF,
+-		BSR_ANY,
+-		PARTIAL_SOFT,
+-		PARTIAL_HARD,
+-		NOTEMPTY_ATSTART
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.14")]
+-	[CCode (ref_function = "g_regex_ref", unref_function = "g_regex_unref", type_id = "G_TYPE_REGEX")]
+-	public class Regex {
+-		public Regex (string pattern, RegexCompileFlags compile_options = 0, RegexMatchFlags match_options = 0) throws RegexError;
+-		public unowned string get_pattern ();
+-		[Version (since = "2.26")]
+-		public RegexCompileFlags get_compile_flags ();
+-		[Version (since = "2.34")]
+-		public bool get_has_cr_or_lf ();
+-		[Version (since = "2.26")]
+-		public RegexMatchFlags get_match_flags ();
+-		public int get_max_backref ();
+-		[Version (since = "2.38")]
+-		public int get_max_lookbehind ();
+-		public int get_capture_count ();
+-		public int get_string_number (string name);
+-		public static string escape_string (string str, int length = -1);
+-		public static bool match_simple (string pattern, string str, RegexCompileFlags compile_options = 0, RegexMatchFlags match_options = 0);
+-		public bool match (string str, RegexMatchFlags match_options = 0, out MatchInfo match_info = null);
+-		public bool match_full (string str, ssize_t string_len = -1, int start_position = 0, RegexMatchFlags match_options = 0, out MatchInfo match_info = null) throws RegexError;
+-		public bool match_all (string str, RegexMatchFlags match_options = 0, out MatchInfo match_info = null);
+-		public bool match_all_full (string str, ssize_t string_len = -1, int start_position = 0, RegexMatchFlags match_options = 0, out MatchInfo match_info = null) throws RegexError;
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public static string[] split_simple (string pattern, string str, RegexCompileFlags compile_options = 0, RegexMatchFlags match_options = 0);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] split (string str, RegexMatchFlags match_options = 0);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] split_full (string str, ssize_t string_len = -1, int start_position = 0, RegexMatchFlags match_options = 0, int max_tokens = 0) throws RegexError;
+-		public string replace (string str, ssize_t string_len, int start_position, string replacement, RegexMatchFlags match_options = 0) throws RegexError;
+-		public string replace_literal (string str, ssize_t string_len, int start_position, string replacement, RegexMatchFlags match_options = 0) throws RegexError;
+-		public string replace_eval (string str, ssize_t string_len, int start_position, RegexMatchFlags match_options, RegexEvalCallback eval) throws RegexError;
+-		public static bool check_replacement (string replacement, out bool has_references = null) throws RegexError;
+-	}
+-
+-	[Version (since = "2.14")]
+-	public delegate bool RegexEvalCallback (MatchInfo match_info, StringBuilder result);
+-
+-	[Compact]
+-	[Version (since = "2.30")]
+-	[CCode (ref_function = "g_match_info_ref", unref_function = "g_match_info_unref", type_id = "G_TYPE_MATCH_INFO")]
+-	public class MatchInfo {
+-		public unowned Regex get_regex ();
+-		public unowned string get_string ();
+-		public bool matches ();
+-		public bool next () throws RegexError;
+-		public int get_match_count ();
+-		public bool is_partial_match ();
+-		public string expand_references (string string_to_expand) throws RegexError;
+-		public string? fetch (int match_num);
+-		public bool fetch_pos (int match_num, out int start_pos, out int end_pos);
+-		public string? fetch_named (string name);
+-		public bool fetch_named_pos (string name, out int start_pos, out int end_pos);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] fetch_all ();
+-	}
+-
+-	/* Simple XML Subset Parser
+-	   See http://live.gnome.org/Vala/MarkupSample for an example */
+-
+-	public errordomain MarkupError {
+-		BAD_UTF8,
+-		EMPTY,
+-		PARSE,
+-		UNKNOWN_ELEMENT,
+-		UNKNOWN_ATTRIBUTE,
+-		INVALID_CONTENT,
+-		MISSING_ATTRIBUTE;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[CCode (cprefix = "G_MARKUP_", has_type_id = false)]
+-	[Flags]
+-	public enum MarkupParseFlags {
+-		TREAT_CDATA_AS_TEXT,
+-		PREFIX_ERROR_POSITION
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.36")]
+-	[CCode (ref_function = "g_markup_parse_context_ref", unref_function = "g_markup_parse_context_unref", type_id = "G_TYPE_MARKUP_PARSE_CONTEXT")]
+-	public class MarkupParseContext {
+-		public MarkupParseContext (MarkupParser parser, MarkupParseFlags _flags, void* user_data, DestroyNotify? user_data_dnotify);
+-		public bool parse (string text, ssize_t text_len) throws MarkupError;
+-		public bool end_parse () throws MarkupError;
+-		[Version (since = "2.2")]
+-		public unowned string get_element ();
+-		[Version (since = "2.16")]
+-		public unowned SList<string> get_element_stack ();
+-		public void get_position (out int line_number, out int char_number);
+-		[Version (since = "2.18")]
+-		public void push (MarkupParser parser, void* user_data);
+-		[Version (since = "2.18")]
+-		public void* pop ();
+-		[Version (since = "2.18")]
+-		public void* get_user_data ();
+-	}
+-
+-	public delegate void MarkupParserStartElementFunc (MarkupParseContext context, string element_name, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_names, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_values) throws MarkupError;
+-
+-	public delegate void MarkupParserEndElementFunc (MarkupParseContext context, string element_name) throws MarkupError;
+-
+-	public delegate void MarkupParserTextFunc (MarkupParseContext context, string text, size_t text_len) throws MarkupError;
+-
+-	public delegate void MarkupParserPassthroughFunc (MarkupParseContext context, string passthrough_text, size_t text_len) throws MarkupError;
+-
+-	public delegate void MarkupParserErrorFunc (MarkupParseContext context, Error error);
+-
+-	public struct MarkupParser {
+-		[CCode (delegate_target = false)]
+-		public unowned MarkupParserStartElementFunc start_element;
+-		[CCode (delegate_target = false)]
+-		public unowned MarkupParserEndElementFunc end_element;
+-		[CCode (delegate_target = false)]
+-		public unowned MarkupParserTextFunc text;
+-		[CCode (delegate_target = false)]
+-		public unowned MarkupParserPassthroughFunc passthrough;
+-		[CCode (delegate_target = false)]
+-		public unowned MarkupParserErrorFunc error;
+-	}
+-
+-	namespace Markup {
+-		[CCode (cprefix = "G_MARKUP_COLLECT_", has_type_id = false)]
+-		public enum CollectType {
+-			INVALID,
+-			STRING,
+-			STRDUP,
+-			BOOLEAN,
+-			TRISTATE,
+-			OPTIONAL
+-		}
+-
+-		public static string escape_text (string text, ssize_t length = -1);
+-		[Version (since = "2.4")]
+-		[PrintfFormat]
+-		public static string printf_escaped (string format, ...);
+-		[Version (since = "2.4")]
+-		public static string vprintf_escaped (string format, va_list args);
+-		[Version (since = "2.16")]
+-		[CCode (sentinel = "G_MARKUP_COLLECT_INVALID")]
+-		public static bool collect_attributes (string element_name, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_names, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_values, ...) throws MarkupError;
+-	}
+-
+-	/* Key-value file parser */
+-
+-	public errordomain KeyFileError {
+-		UNKNOWN_ENCODING,
+-		PARSE,
+-		NOT_FOUND,
+-		KEY_NOT_FOUND,
+-		GROUP_NOT_FOUND,
+-		INVALID_VALUE;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.32")]
+-	[CCode (ref_function = "g_key_file_ref", unref_function = "g_key_file_unref", type_id = "G_TYPE_KEY_FILE")]
+-	public class KeyFile {
+-		public KeyFile ();
+-		public void set_list_separator (char separator);
+-		[Version (since = "2.50")]
+-		public bool load_from_bytes (Bytes bytes, KeyFileFlags @flags) throws KeyFileError;
+-		public bool load_from_file (string file, KeyFileFlags @flags) throws KeyFileError, FileError;
+-		[Version (since = "2.14")]
+-		public bool load_from_dirs (string file, [CCode (array_length = false, array_null_terminated = true)] string[] search_dirs, out string full_path, KeyFileFlags @flags) throws KeyFileError, FileError;
+-		public bool load_from_data (string data, size_t length, KeyFileFlags @flags) throws KeyFileError;
+-		public bool load_from_data_dirs (string file, out string full_path, KeyFileFlags @flags) throws KeyFileError, FileError;
+-		// g_key_file_to_data never throws an error according to the documentation
+-		public string to_data (out size_t length = null, out GLib.Error error = null);
+-		public string get_start_group ();
+-		[CCode (array_length_type = "gsize")]
+-		public string[] get_groups ();
+-		[CCode (array_length_type = "gsize")]
+-		public string[] get_keys (string group_name) throws KeyFileError;
+-		public bool has_group (string group_name);
+-		public bool has_key (string group_name, string key) throws KeyFileError;
+-		public string get_value (string group_name, string key) throws KeyFileError;
+-		public string get_string (string group_name, string key) throws KeyFileError;
+-		public string get_locale_string (string group_name, string key, string? locale = null) throws KeyFileError;
+-		[Version (since = "2.56")]
+-		public string? get_locale_for_key (string group_name, string key, string? locale = null);
+-		public bool get_boolean (string group_name, string key) throws KeyFileError;
+-		public int get_integer (string group_name, string key) throws KeyFileError;
+-		[Version (since = "2.26")]
+-		public int64 get_int64 (string group_name, string key) throws KeyFileError;
+-		[Version (since = "2.26")]
+-		public uint64 get_uint64 (string group_name, string key) throws KeyFileError;
+-		[Version (since = "2.12")]
+-		public double get_double (string group_name, string key) throws KeyFileError;
+-		[CCode (array_length = true, array_length_type = "gsize", array_null_terminated = true)]
+-		public string[] get_string_list (string group_name, string key) throws KeyFileError;
+-		[CCode (array_length_type = "gsize")]
+-		public string[] get_locale_string_list (string group_name, string key, string? locale = null) throws KeyFileError;
+-		[CCode (array_length_type = "gsize")]
+-		public bool[] get_boolean_list (string group_name, string key) throws KeyFileError;
+-		[CCode (array_length_type = "gsize")]
+-		public int[] get_integer_list (string group_name, string key) throws KeyFileError;
+-		[Version (since = "2.12")]
+-		[CCode (array_length_type = "gsize")]
+-		public double[] get_double_list (string group_name, string key) throws KeyFileError;
+-		public string get_comment (string? group_name, string? key) throws KeyFileError;
+-		[Version (since = "2.40")]
+-		public bool save_to_file (string filename) throws GLib.FileError;
+-		public void set_value (string group_name, string key, string value);
+-		public void set_string (string group_name, string key, string str);
+-		public void set_locale_string (string group_name, string key, string locale, string str);
+-		public void set_boolean (string group_name, string key, bool value);
+-		public void set_integer (string group_name, string key, int value);
+-		[Version (since = "2.26")]
+-		public void set_int64 (string group_name, string key, int64 value);
+-		[Version (since = "2.26")]
+-		public void set_uint64 (string group_name, string key, uint64 value);
+-		[Version (since = "2.12")]
+-		public void set_double (string group_name, string key, double value);
+-		public void set_string_list (string group_name, string key, [CCode (type = "const gchar* const*")] string[] list);
+-		public void set_locale_string_list (string group_name, string key, string locale, string[] list);
+-		public void set_boolean_list (string group_name, string key, bool[] list);
+-		public void set_integer_list (string group_name, string key, int[] list);
+-		[Version (since = "2.12")]
+-		public void set_double_list (string group_name, string key, double[] list);
+-		public void set_comment (string? group_name, string? key, string comment) throws KeyFileError;
+-		public void remove_group (string group_name) throws KeyFileError;
+-		public void remove_key (string group_name, string key) throws KeyFileError;
+-		public void remove_comment (string group_name, string key) throws KeyFileError;
+-	}
+-
+-	[CCode (cprefix = "G_KEY_FILE_", has_type_id = false)]
+-	[Flags]
+-	public enum KeyFileFlags {
+-		NONE,
+-		KEEP_COMMENTS,
+-		KEEP_TRANSLATIONS
+-	}
+-
+-	[Version (since = "2.14")]
+-	[CCode (cprefix = "G_KEY_FILE_DESKTOP_")]
+-	namespace KeyFileDesktop {
+-		public const string GROUP;
+-		public const string KEY_ACTIONS;
+-		public const string KEY_CATEGORIES;
+-		public const string KEY_COMMENT;
+-		public const string KEY_DBUS_ACTIVATABLE;
+-		public const string KEY_EXEC;
+-		public const string KEY_FULLNAME;
+-		public const string KEY_GENERIC_NAME;
+-		public const string KEY_GETTEXT_DOMAIN;
+-		public const string KEY_HIDDEN;
+-		public const string KEY_ICON;
+-		public const string KEY_KEYWORDS;
+-		public const string KEY_MIME_TYPE;
+-		public const string KEY_NAME;
+-		public const string KEY_NOT_SHOW_IN;
+-		public const string KEY_NO_DISPLAY;
+-		public const string KEY_ONLY_SHOW_IN;
+-		public const string KEY_PATH;
+-		public const string KEY_STARTUP_NOTIFY;
+-		public const string KEY_STARTUP_WM_CLASS;
+-		public const string KEY_TERMINAL;
+-		public const string KEY_TRY_EXEC;
+-		public const string KEY_TYPE;
+-		public const string KEY_URL;
+-		public const string KEY_VERSION;
+-		public const string TYPE_APPLICATION;
+-		public const string TYPE_DIRECTORY;
+-		public const string TYPE_LINK;
+-	}
+-
+-	/* Bookmark file parser */
+-
+-	[Compact]
+-	[Version (since = "2.12")]
+-	[CCode (free_function = "g_bookmark_file_free")]
+-	public class BookmarkFile {
+-		public BookmarkFile ();
+-		public bool load_from_file (string file) throws BookmarkFileError, FileError;
+-		public bool load_from_data (string data, size_t length) throws BookmarkFileError;
+-		public bool load_from_data_dirs (string file, out string full_path) throws BookmarkFileError, FileError;
+-		public string to_data (out size_t length) throws BookmarkFileError;
+-		public bool to_file (string filename) throws BookmarkFileError, FileError;
+-		public bool has_item (string uri);
+-		public bool has_group (string uri, string group) throws BookmarkFileError;
+-		public bool has_application (string uri, string name) throws BookmarkFileError;
+-		public int get_size ();
+-		[CCode (array_length_type = "gsize")]
+-		public string[] get_uris ();
+-		public string get_title (string uri) throws BookmarkFileError;
+-		public string get_description (string uri) throws BookmarkFileError;
+-		public string get_mime_type (string uri) throws BookmarkFileError;
+-		public bool get_is_private (string uri) throws BookmarkFileError;
+-		public bool get_icon (string uri, out string href, out string mime_type) throws BookmarkFileError;
+-		public time_t get_added (string uri) throws BookmarkFileError;
+-		public time_t get_modified (string uri) throws BookmarkFileError;
+-		public time_t get_visited (string uri) throws BookmarkFileError;
+-		[CCode (array_length_type = "gsize")]
+-		public string[] get_groups (string uri) throws BookmarkFileError;
+-		[CCode (array_length_type = "gsize")]
+-		public string[] get_applications (string uri) throws BookmarkFileError;
+-		public bool get_app_info (string uri, string name, out string exec, out uint count, out time_t stamp) throws BookmarkFileError;
+-		public void set_title (string uri, string title);
+-		public void set_description (string uri, string description);
+-		public void set_mime_type (string uri, string mime_type);
+-		public void set_is_private (string uri, bool is_private);
+-		public void set_icon (string uri, string href, string mime_type);
+-		public void set_added (string uri, time_t added);
+-		public void set_groups (string uri, string[] groups);
+-		public void set_modified (string uri, time_t modified);
+-		public void set_visited (string uri, time_t visited);
+-		public bool set_app_info (string uri, string name, string exec, int count, time_t stamp) throws BookmarkFileError;
+-		public void add_group (string uri, string group);
+-		public void add_application (string uri, string name, string exec);
+-		public bool remove_group (string uri, string group) throws BookmarkFileError;
+-		public bool remove_application (string uri, string name) throws BookmarkFileError;
+-		public bool remove_item (string uri) throws BookmarkFileError;
+-		public bool move_item (string old_uri, string new_uri) throws BookmarkFileError;
+-	}
+-
+-	public errordomain BookmarkFileError {
+-		INVALID_URI,
+-		INVALID_VALUE,
+-		APP_NOT_REGISTERED,
+-		URI_NOT_FOUND,
+-		READ,
+-		UNKNOWN_ENCODING,
+-		WRITE,
+-		FILE_NOT_FOUND;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	/* Testing */
+-
+-	namespace Test {
+-		[CCode (cprefix = "G_TEST_", has_type_id = false)]
+-		public enum FileType {
+-			DIST,
+-			BUILT
+-		}
+-
+-		[PrintfFormat]
+-		[Version (since = "2.16")]
+-		public static void minimized_result (double minimized_quantity, string format, ...);
+-		[PrintfFormat]
+-		[Version (since = "2.16")]
+-		public static void maximized_result (double maximized_quantity, string format, ...);
+-		[Version (since = "2.16")]
+-		public static void init ([CCode (array_length_pos = 0.9)] ref unowned string[] args, ...);
+-		public static bool quick ();
+-		public static bool slow ();
+-		public static bool thorough ();
+-		public static bool perf ();
+-		public static bool verbose ();
+-		public static bool quiet ();
+-		[Version (since = "2.16")]
+-		public static int run ();
+-		[Version (since = "2.16")]
+-		public static void add (string testpath, void* fixture, [CCode (delegate_target_pos = 2.9)] TestFixtureFunc fsetup, [CCode (delegate_target_pos = 2.9)] TestFixtureFunc ftest, [CCode (delegate_target_pos = 2.9)] TestFixtureFunc fteardown);
+-		[Version (since = "2.16")]
+-		public static void add_func (string testpath, [CCode (scope = "async")] owned TestFunc test_funcvoid);
+-		[Version (since = "2.16")]
+-		public static void add_data_func (string testpath, [CCode (delegate_target_pos = 1.9, scope = "async")] owned TestDataFunc test_funcvoid);
+-		[Version (since = "2.34")]
+-		public static void add_data_func_full (string testpath, [CCode (delegate_target_pos = 1.9)] owned TestDataFunc test_func);
+-		[Version (since = "2.34")]
+-		public static void assert_expected_messages ();
+-		[Version (since = "2.38")]
+-		public static string build_filename (GLib.Test.FileType file_type, params string[] path_segments);
+-		[Version (since = "2.34")]
+-		public static void expect_message (string? log_domain, LogLevelFlags log_level, string pattern);
+-		[Version (since = "2.30")]
+-		public static void fail ();
+-		[Version (since = "2.38")]
+-		public static bool failed ();
+-		[Version (since = "2.38")]
+-		public static unowned string get_dir (GLib.Test.FileType file_type);
+-		[Version (since = "2.38")]
+-		public static unowned string get_filename (GLib.Test.FileType file_type, params string[] path_segments);
+-		[Version (since = "2.38")]
+-		public static void incomplete (string? msg = null);
+-		[Version (since = "2.36")]
+-		public static bool initialized ();
+-		[PrintfFormat]
+-		[Version (since = "2.16")]
+-		public static void message (string format, ...);
+-		[Version (since = "2.38")]
+-		public static void set_nonfatal_assertions ();
+-		[Version (since = "2.38")]
+-		public static void skip (string? msg = null);
+-		[Version (since = "2.38")]
+-		public static bool subprocess ();
+-		[Version (since = "2.16")]
+-		public static void bug_base (string uri_pattern);
+-		[Version (since = "2.16")]
+-		public static void bug (string bug_uri_snippet);
+-		[Version (since = "2.16")]
+-		public static void timer_start ();
+-		[Version (since = "2.16")]
+-		public static double timer_elapsed ();
+-		[Version (since = "2.16")]
+-		public static double timer_last ();
+-		[Version (since = "2.16", deprecated_since = "2.38", replacement = "trap_subprocess")]
+-		public static bool trap_fork (uint64 usec_timeout, TestTrapFlags test_trap_flags);
+-		[Version (since = "2.16")]
+-		public static bool trap_has_passed ();
+-		[Version (since = "2.16")]
+-		public static bool trap_reached_timeout ();
+-		[Version (since = "2.38")]
+-		public static void trap_subprocess (string? test_path, uint64 usec_timeout, TestSubprocessFlags test_flags);
+-		[Version (since = "2.16")]
+-		public static void trap_assert_passed ();
+-		[Version (since = "2.16")]
+-		public static void trap_assert_failed ();
+-		[Version (since = "2.16")]
+-		public static void trap_assert_stdout (string soutpattern);
+-		[Version (since = "2.16")]
+-		public static void trap_assert_stdout_unmatched (string soutpattern);
+-		[Version (since = "2.16")]
+-		public static void trap_assert_stderr (string serrpattern);
+-		[Version (since = "2.16")]
+-		public static void trap_assert_stderr_unmatched (string serrpattern);
+-		[Version (since = "2.16")]
+-		public static bool rand_bit ();
+-		[Version (since = "2.16")]
+-		public static int32 rand_int ();
+-		[Version (since = "2.16")]
+-		public static int32 rand_int_range (int32 begin, int32 end);
+-		[Version (since = "2.16")]
+-		public static double rand_double ();
+-		[Version (since = "2.16")]
+-		public static double rand_double_range (double begin, double end);
+-		[Version (since = "2.22")]
+-		public static void log_set_fatal_handler (LogFatalFunc log_func);
+-	}
+-
+-	public delegate bool LogFatalFunc (string? log_domain, LogLevelFlags log_levels, string message);
+-
+-	[Compact]
+-	[CCode (cname = "GTestCase", ref_function = "", unref_function = "")]
+-	public class TestCase {
+-		[Version (since = "2.16")]
+-		[CCode (cname = "g_test_create_case")]
+-		public TestCase (string test_name, [CCode (delegate_target_pos = 1.9)] TestFixtureFunc data_setup, [CCode (delegate_target_pos = 1.9)] TestFixtureFunc data_func, [CCode (delegate_target_pos = 1.9)] TestFixtureFunc data_teardown, [CCode (pos = 1.8)] size_t data_size = 0);
+-	}
+-
+-	[Compact]
+-	[CCode (cname = "GTestSuite", ref_function = "", unref_function = "")]
+-	public class TestSuite {
+-		[Version (since = "2.16")]
+-		[CCode (cname = "g_test_create_suite")]
+-		public TestSuite (string name);
+-		[Version (since = "2.16")]
+-		[CCode (cname = "g_test_get_root")]
+-		public static TestSuite get_root ();
+-		[Version (since = "2.16")]
+-		[CCode (cname = "g_test_suite_add")]
+-		public void add (TestCase test_case);
+-		[Version (since = "2.16")]
+-		[CCode (cname = "g_test_suite_add_suite")]
+-		public void add_suite (TestSuite test_suite);
+-	}
+-
+-	[Version (since = "2.26")]
+-	[CCode (has_target = false)]
+-	public delegate void TestFunc ();
+-	[Version (since = "2.26")]
+-	public delegate void TestDataFunc ();
+-	[Version (since = "2.26")]
+-	public delegate void TestFixtureFunc (void* fixture);
+-
+-	[CCode (cprefix = "G_TEST_SUBPROCESS_INHERIT_", has_type_id = false)]
+-	[Flags]
+-	public enum TestSubprocessFlags {
+-		STDIN,
+-		STDOUT,
+-		STDERR
+-	}
+-
+-	[Flags]
+-	[CCode (cprefix = "G_TEST_TRAP_", has_type_id = false)]
+-	public enum TestTrapFlags {
+-		SILENCE_STDOUT,
+-		SILENCE_STDERR,
+-		INHERIT_STDIN
+-	}
+-
+-	/* Doubly-Linked Lists */
+-
+-	[Compact]
+-	[CCode (dup_function = "g_list_copy", free_function = "g_list_free")]
+-	public class List<G> {
+-		public List ();
+-
+-		[ReturnsModifiedPointer ()]
+-		public void append (owned G data);
+-		[ReturnsModifiedPointer ()]
+-		public void prepend (owned G data);
+-		[ReturnsModifiedPointer ()]
+-		public void insert (owned G data, int position);
+-		[ReturnsModifiedPointer ()]
+-		public void insert_before (List<G> sibling, owned G data);
+-		[ReturnsModifiedPointer ()]
+-		public void insert_sorted (owned G data, CompareFunc<G> compare_func);
+-		[ReturnsModifiedPointer ()]
+-		public void remove (G data);
+-		[ReturnsModifiedPointer ()]
+-		public void remove_link (List<G> llink);
+-		[ReturnsModifiedPointer ()]
+-		public void delete_link (List<G> link_);
+-		[ReturnsModifiedPointer ()]
+-		public void remove_all (G data);
+-
+-		public uint length ();
+-		public List<unowned G> copy ();
+-		[Version (since = "2.34")]
+-		public List<G> copy_deep (CopyFunc<G> func);
+-		[ReturnsModifiedPointer ()]
+-		public void reverse ();
+-		[ReturnsModifiedPointer ()]
+-		public void sort (CompareFunc<G> compare_func);
+-		[Version (since = "2.10")]
+-		[ReturnsModifiedPointer ()]
+-		public void insert_sorted_with_data (owned G data, CompareDataFunc<G> compare_func);
+-		[ReturnsModifiedPointer ()]
+-		public void sort_with_data (CompareDataFunc<G> compare_func);
+-		[ReturnsModifiedPointer ()]
+-		public void concat (owned List<G> list2);
+-		public void @foreach (Func<G> func);
+-
+-		public unowned List<G> first ();
+-		public unowned List<G> last ();
+-		public unowned List<G> nth (uint n);
+-		public unowned G nth_data (uint n);
+-		public unowned List<G> nth_prev (uint n);
+-
+-		public unowned List<G> find (G data);
+-		public unowned List<G> find_custom (G data, CompareFunc<G> func);
+-		[CCode (cname = "g_list_find_custom", simple_generics = true)]
+-		public unowned List<G> search<T> (T data, SearchFunc<G,T> func);
+-
+-		public int position (List<G> llink);
+-		public int index (G data);
+-
+-		public G data;
+-		public List<G> next;
+-		public unowned List<G> prev;
+-	}
+-
+-	/* Singly-Linked Lists */
+-
+-	[Compact]
+-	[CCode (dup_function = "g_slist_copy", free_function = "g_slist_free")]
+-	public class SList<G> {
+-		public SList ();
+-
+-		[ReturnsModifiedPointer ()]
+-		public void append (owned G data);
+-		[ReturnsModifiedPointer ()]
+-		public void prepend (owned G data);
+-		[ReturnsModifiedPointer ()]
+-		public void insert (owned G data, int position);
+-		[ReturnsModifiedPointer ()]
+-		public void insert_before (SList<G> sibling, owned G data);
+-		[ReturnsModifiedPointer ()]
+-		public void insert_sorted (owned G data, CompareFunc<G> compare_func);
+-		[ReturnsModifiedPointer ()]
+-		public void remove (G data);
+-		[ReturnsModifiedPointer ()]
+-		public void remove_link (SList<G> llink);
+-		[ReturnsModifiedPointer ()]
+-		public void delete_link (SList<G> link_);
+-		[ReturnsModifiedPointer ()]
+-		public void remove_all (G data);
+-
+-		public uint length ();
+-		public SList<unowned G> copy ();
+-		[Version (since = "2.34")]
+-		public SList<G> copy_deep (CopyFunc<G> func);
+-		[ReturnsModifiedPointer ()]
+-		public void reverse ();
+-		[Version (since = "2.10")]
+-		[ReturnsModifiedPointer ()]
+-		public void insert_sorted_with_data (owned G data, CompareDataFunc<G> compare_func);
+-		[ReturnsModifiedPointer ()]
+-		public void sort (CompareFunc<G> compare_func);
+-		[ReturnsModifiedPointer ()]
+-		public void sort_with_data (CompareDataFunc<G> compare_func);
+-		[ReturnsModifiedPointer ()]
+-		public void concat (owned SList<G> list2);
+-		public void @foreach (Func<G> func);
+-
+-		public unowned SList<G> last ();
+-		public unowned SList<G> nth (uint n);
+-		public unowned G nth_data (uint n);
+-
+-		public unowned SList<G> find (G data);
+-		public unowned SList<G> find_custom (G data, CompareFunc<G> func);
+-		[CCode (cname = "g_slist_find_custom", simple_generics = true)]
+-		public unowned SList<G> search<T> (T data, SearchFunc<G,T> func);
+-
+-		public int position (SList<G> llink);
+-		public int index (G data);
+-
+-		public G data;
+-		public SList<G> next;
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate int CompareFunc<G> (G a, G b);
+-
+-	public delegate int CompareDataFunc<G> (G a, G b);
+-
+-	[Version (since = "2.16")]
+-	[CCode (cname = "((GCompareFunc) g_strcmp0)")]
+-	public static GLib.CompareFunc<string> strcmp;
+-
+-	public delegate G CopyFunc<G> (G src);
+-
+-	[CCode (cname = "GCompareFunc", has_target = false)]
+-	public delegate int SearchFunc<G,T> (G a, T b);
+-
+-	/* Double-ended Queues */
+-
+-	[Compact]
+-	[CCode (dup_function = "g_queue_copy", free_function = "g_queue_free")]
+-	public class Queue<G> {
+-		public unowned List<G> head;
+-		public unowned List<G> tail;
+-		public uint length;
+-
+-		public Queue ();
+-
+-		[Version (since = "2.14")]
+-		public void clear ();
+-		public bool is_empty ();
+-		[Version (since = "2.4")]
+-		public uint get_length ();
+-		[Version (since = "2.4")]
+-		public void reverse ();
+-		public Queue copy ();
+-		[Version (since = "2.4")]
+-		public unowned List<G> find (G data);
+-		[Version (since = "2.4")]
+-		public unowned List<G> find_custom (G data, CompareFunc<G> func);
+-		[CCode (cname = "g_queue_find_custom", simple_generics = true)]
+-		public unowned List<G> search<T> (T data, SearchFunc<G,T> func);
+-		[Version (since = "2.4")]
+-		public void sort (CompareDataFunc<G> compare_func);
+-		public void push_head (owned G data);
+-		public void push_tail (owned G data);
+-		[Version (since = "2.4")]
+-		public void push_nth (owned G data, int n);
+-		public G pop_head ();
+-		public G pop_tail ();
+-		[Version (since = "2.4")]
+-		public G pop_nth (uint n);
+-		public unowned G peek_head ();
+-		public unowned G peek_tail ();
+-		[Version (since = "2.4")]
+-		public unowned G peek_nth (uint n);
+-		[Version (since = "2.4")]
+-		public int index (G data);
+-		[Version (since = "2.4")]
+-		public bool remove (G data);
+-		[Version (since = "2.4")]
+-		public uint remove_all (G data);
+-		[Version (since = "2.4")]
+-		public void delete_link (List<G> link);
+-		[Version (since = "2.4")]
+-		public void unlink (List<G> link);
+-		[Version (since = "2.4")]
+-		public void insert_before (List<G> sibling, owned G data);
+-		[Version (since = "2.4")]
+-		public void insert_after (List<G> sibling, owned G data);
+-		[Version (since = "2.4")]
+-		public void insert_sorted (owned G data, CompareDataFunc<G> func);
+-	}
+-
+-	/* Sequences */
+-
+-	[Compact]
+-	[Version (since = "2.14")]
+-	[CCode (free_function = "g_sequence_free")]
+-	public class Sequence<G> {
+-		[CCode (simple_generics = true)]
+-		public Sequence ();
+-		public int get_length ();
+-		public void @foreach (Func<G> func);
+-		public void sort (CompareDataFunc<G> cmp_func);
+-		public void sort_iter (SequenceIterCompareFunc<G> func);
+-		public SequenceIter<G> get_begin_iter ();
+-		public SequenceIter<G> get_end_iter ();
+-		public SequenceIter<G> get_iter_at_pos (int pos);
+-		public SequenceIter<G> append (owned G data);
+-		public SequenceIter<G> prepend (owned G data);
+-		public SequenceIter<G> insert_sorted (owned G data, CompareDataFunc<G> cmp_func);
+-		[Version (since = "2.48")]
+-		public bool is_empty ();
+-		public SequenceIter<G> insert_sorted_iter (owned G data, SequenceIterCompareFunc<G> iter_cmp);
+-		public SequenceIter<G> search (G data, CompareDataFunc<G> cmp_func);
+-		public SequenceIter<G> search_iter (G data, SequenceIterCompareFunc<G> iter_cmp);
+-		[Version (since = "2.28")]
+-		public SequenceIter<G> lookup (G data, CompareDataFunc<G> cmp_func);
+-		[Version (since = "2.28")]
+-		public SequenceIter<G> lookup_iter (G data, SequenceIterCompareFunc<G> iter_cmp);
+-
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.foreach_range")]
+-		public static void foreach_range (SequenceIter<G> begin, SequenceIter<G> end, Func<G> func);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.insert_before")]
+-		public static SequenceIter<G> insert_before (SequenceIter<G> iter, owned G data);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.move_to")]
+-		public static void move (SequenceIter<G> src, SequenceIter<G> dest);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.swap")]
+-		public static void swap (SequenceIter<G> src, SequenceIter<G> dest);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.sort_changed")]
+-		public static void sort_changed (SequenceIter<G> iter, CompareDataFunc<G> cmp_func);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.sort_changed_iter")]
+-		public static void sort_changed_iter (SequenceIter<G> iter, SequenceIterCompareFunc<G> iter_cmp);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.remove")]
+-		public static void remove (SequenceIter<G> iter);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.remove_range")]
+-		public static void remove_range (SequenceIter<G> begin, SequenceIter<G> end);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.move_range")]
+-		public static void move_range (SequenceIter<G> dest, SequenceIter<G> begin, SequenceIter<G> end);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.get")]
+-		public static unowned G get (SequenceIter<G> iter);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.set")]
+-		public static void set (SequenceIter<G> iter, owned G data);
+-		[Version (deprecated_since = "vala-0.26", replacement = "SequenceIter.range_get_midpoint")]
+-		public static SequenceIter<G> range_get_midpoint (SequenceIter<G> begin, SequenceIter<G> end);
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.14")]
+-	[CCode (ref_function = "", unref_function = "")]
+-	public class SequenceIter<G> {
+-		public bool is_begin ();
+-		public bool is_end ();
+-		public SequenceIter<G> next ();
+-		public SequenceIter<G> prev ();
+-		public int get_position ();
+-		public SequenceIter<G> move (int delta);
+-		public unowned Sequence<G> get_sequence ();
+-		public int compare (SequenceIter<G> other);
+-
+-		[CCode (cname = "g_sequence_foreach_range")]
+-		public void foreach_range (SequenceIter<G> end, Func<G> func);
+-		[CCode (cname = "g_sequence_insert_before")]
+-		public SequenceIter<G> insert_before (owned G data);
+-		[CCode (cname = "g_sequence_move")]
+-		public void move_to (SequenceIter<G> dest);
+-		[CCode (cname = "g_sequence_swap")]
+-		public void swap (SequenceIter<G> dest);
+-		[CCode (cname = "g_sequence_sort_changed")]
+-		public void sort_changed (CompareDataFunc<G> cmp_func);
+-		[CCode (cname = "g_sequence_sort_changed_iter")]
+-		public void sort_changed_iter (SequenceIterCompareFunc<G> iter_cmp);
+-		[CCode (cname = "g_sequence_remove")]
+-		public void remove ();
+-		[CCode (cname = "g_sequence_remove_range")]
+-		public void remove_range (SequenceIter<G> end);
+-		[CCode (cname = "g_sequence_move_range")]
+-		public void move_range (SequenceIter<G> begin, SequenceIter<G> end);
+-		[CCode (cname = "g_sequence_get")]
+-		public unowned G get ();
+-		[CCode (cname = "g_sequence_set")]
+-		public void set (owned G data);
+-		[CCode (cname = "g_sequence_range_get_midpoint")]
+-		public SequenceIter<G> range_get_midpoint (SequenceIter<G> end);
+-	}
+-
+-	public delegate int SequenceIterCompareFunc<G> (SequenceIter<G> a, SequenceIter<G> b);
+-
+-	/* Hash Tables */
+-
+-	[Compact]
+-	[CCode (ref_function = "g_hash_table_ref", unref_function = "g_hash_table_unref", type_id = "G_TYPE_HASH_TABLE", type_signature = "a{%s}")]
+-	public class HashTable<K,V> {
+-		[CCode (cname = "g_hash_table_new_full", simple_generics = true)]
+-		public HashTable (HashFunc<K>? hash_func, EqualFunc<K>? key_equal_func);
+-		public HashTable.full (HashFunc<K>? hash_func, EqualFunc<K>? key_equal_func, DestroyNotify? key_destroy_func, DestroyNotify? value_destroy_func);
+-		public void insert (owned K key, owned V value);
+-		public void replace (owned K key, owned V value);
+-		[Version (since = "2.32", deprecated_since = "vala-0.26", replacement = "GenericSet.add")]
+-		public void add (owned K key);
+-		public unowned V? lookup (K key);
+-		public bool lookup_extended (K lookup_key, out unowned K orig_key, out unowned V value);
+-		[Version (since = "2.32")]
+-		public bool contains (K key);
+-		public bool remove (K key);
+-		[Version (since = "2.12")]
+-		public void remove_all ();
+-		public uint foreach_remove (HRFunc<K,V> predicate);
+-		public uint foreach_steal (HRFunc<K,V> predicate);
+-		[CCode (cname = "g_hash_table_lookup")]
+-		public unowned V? @get (K key);
+-		[CCode (cname = "g_hash_table_insert")]
+-		public void @set (owned K key, owned V value);
+-		[Version (since = "2.14")]
+-		public List<unowned K> get_keys ();
+-#if VALA_0_26
+-		[CCode (array_length_type = "guint")]
+-		[Version (since = "2.40")]
+-		public (unowned K)[] get_keys_as_array ();
+-#endif
+-		[Version (since = "2.14")]
+-		public List<unowned V> get_values ();
+-		public void @foreach (HFunc<K,V> func);
+-		[CCode (cname = "g_hash_table_foreach")]
+-		public void for_each (HFunc<K,V> func);
+-		[Version (since = "2.4")]
+-		public unowned V? find (HRFunc<K,V> predicate);
+-		public uint size ();
+-		public bool steal (K key);
+-		[Version (since = "2.12")]
+-		public void steal_all ();
+-		[Version (since = "2.58")]
+-		public bool steal_extended (K lookup_key, out K stolen_key, out V stolen_value);
+-		[CCode (cname = "_vala_g_hash_table_take")]
+-		public V? take (K key, out bool exists = null) {
+-			GLib.HashTable<K,V>? ht = null;
+-			void** htp = &ht;
+-			*htp = this.lookup (key);
+-			exists = this.steal (key);
+-			return ht;
+-		}
+-		public uint length {
+-			[CCode (cname = "g_hash_table_size")]
+-			get;
+-		}
+-	}
+-
+-	[Version (since = "2.16")]
+-	public struct HashTableIter<K,V> {
+-		public HashTableIter (GLib.HashTable<K,V> table);
+-		public bool next ([CCode (type = "gpointer*")] out unowned K key, [CCode (type = "gpointer*")] out unowned V value);
+-		public void remove ();
+-		public void steal ();
+-		public unowned GLib.HashTable<K,V> get_hash_table ();
+-	}
+-
+-	[Version (since = "2.32")]
+-	[Compact, CCode (cname = "GHashTable", lower_case_cprefix = "g_hash_table_", ref_function = "g_hash_table_ref", unref_function = "g_hash_table_unref", type_id = "G_TYPE_HASH_TABLE", type_signature = "a{%s}")]
+-	public class GenericSet<T> {
+-		[CCode (cname = "g_hash_table_new_full", simple_generics = true)]
+-		public GenericSet (HashFunc<T>? hash_func, EqualFunc<T>? equal_func, GLib.DestroyNotify? always_pass_null_here = null);
+-		public void add (owned T value);
+-		public bool contains (T valule);
+-		public bool remove (T value);
+-		public void remove_all ();
+-		public GLib.List<unowned T> get_values ();
+-		[CCode (cname = "g_hash_table_iter_init", instance_pos = -1)]
+-		public GLib.GenericSetIter<T> iterator ();
+-		[CCode (cname = "_vala_g_hash_set_foreach")]
+-		public void @foreach (GLib.Func<T> func) {
+-			((GLib.HashTable<unowned T,T>) this).foreach ((k, v) => func (v));
+-		}
+-		public uint length {
+-			[CCode (cname = "g_hash_table_size")]
+-			get;
+-		}
+-	}
+-
+-	[Version (since = "2.32")]
+-	[CCode (cname = "GHashTableIter", lower_case_cprefix = "g_hash_table_iter_")]
+-	public struct GenericSetIter<T> {
+-		[CCode (cname = "_vala_hash_set_next_value")]
+-		public unowned T? next_value () {
+-			void* vi = &this;
+-			GLib.HashTableIter<unowned T,T>* htp = vi;
+-			unowned T? value;
+-			return htp->next (out value, null) ? value : null;
+-		}
+-		public void remove ();
+-	}
+-
+-	[CCode (has_target = false)]
+-	public delegate uint HashFunc<K> (K key);
+-	[CCode (has_target = false)]
+-	public delegate bool EqualFunc<G> (G a, G b);
+-	public delegate void HFunc<K,V> (K key, V value);
+-	public delegate bool HRFunc<K,V> (K key, V value);
+-
+-	[CCode (has_target = false)]
+-	public delegate void DestroyNotify (void* data);
+-
+-	[CCode (cname = "g_direct_hash")]
+-	public static GLib.HashFunc<void*> direct_hash;
+-	[CCode (cname = "g_direct_equal")]
+-	public static GLib.EqualFunc<void*> direct_equal;
+-	[CCode (cname = "g_int64_hash")]
+-	public static GLib.HashFunc<int64?> int64_hash;
+-	[Version (since = "2.22")]
+-	[CCode (cname = "g_int64_equal")]
+-	public static GLib.EqualFunc<int64?> int64_equal;
+-	[Version (since = "2.22")]
+-	[CCode (cname = "g_int_hash")]
+-	public static GLib.HashFunc<int?> int_hash;
+-	[CCode (cname = "g_int_equal")]
+-	public static GLib.EqualFunc<int?> int_equal;
+-	[CCode (cname = "g_str_hash")]
+-	public static GLib.HashFunc<string> str_hash;
+-	[CCode (cname = "g_str_equal")]
+-	public static GLib.EqualFunc<string> str_equal;
+-	[CCode (cname = "g_free")]
+-	public static GLib.DestroyNotify g_free;
+-	[CCode (cname = "g_list_free")]
+-	public static GLib.DestroyNotify g_list_free;
+-	[CCode (cname = "((GDestroyNotify) g_variant_unref)")]
+-	public static GLib.DestroyNotify g_variant_unref;
+-
+-	/* Strings */
+-
+-	[Compact]
+-	[GIR (name = "String")]
+-	[CCode (cname = "GString", cprefix = "g_string_", free_function = "g_string_free", type_id = "G_TYPE_GSTRING")]
+-	public class StringBuilder {
+-		public StringBuilder (string init = "");
+-		[CCode (cname = "g_string_sized_new")]
+-		public StringBuilder.sized (size_t dfl_size);
+-		public unowned StringBuilder assign (string rval);
+-		public unowned StringBuilder append (string val);
+-		public unowned StringBuilder append_c (char c);
+-		public unowned StringBuilder append_unichar (unichar wc);
+-		public unowned StringBuilder append_len (string val, ssize_t len);
+-		public unowned StringBuilder prepend (string val);
+-		public unowned StringBuilder prepend_c (char c);
+-		public unowned StringBuilder prepend_unichar (unichar wc);
+-		public unowned StringBuilder prepend_len (string val, ssize_t len);
+-		public unowned StringBuilder insert (ssize_t pos, string val);
+-		public unowned StringBuilder insert_len (ssize_t pos, string val, ssize_t len);
+-		public unowned StringBuilder insert_unichar (ssize_t pos, unichar wc);
+-		[Version (since = "2.14")]
+-		public unowned StringBuilder overwrite (size_t pos, string val);
+-		[Version (since = "2.14")]
+-		public unowned StringBuilder overwrite_len (size_t pos, string val, ssize_t len);
+-		public unowned StringBuilder erase (ssize_t pos = 0, ssize_t len = -1);
+-		public unowned StringBuilder truncate (size_t len = 0);
+-
+-		[PrintfFormat]
+-		public void printf (string format, ...);
+-		[PrintfFormat]
+-		public void append_printf (string format, ...);
+-		[Version (since = "2.14")]
+-		public void vprintf (string format, va_list args);
+-		[Version (since = "2.14")]
+-		public void append_vprintf (string format, va_list args);
+-
+-		public string str;
+-		public ssize_t len;
+-		public ssize_t allocated_len;
+-
+-		public uint8[] data {
+-			get {
+-				unowned uint8[] res = (uint8[]) this.str;
+-				res.length = (int) this.len;
+-				return res;
+-			}
+-		}
+-
+-		[Version (since = "2.34")]
+-		public static Bytes free_to_bytes (owned StringBuilder str);
+-	}
+-
+-	/* String Chunks */
+-
+-	[Compact]
+-	[CCode (free_function = "g_string_chunk_free")]
+-	public class StringChunk {
+-		public StringChunk (size_t size);
+-		public unowned string insert (string str);
+-		public unowned string insert_const (string str);
+-		[Version (since = "2.4")]
+-		public unowned string insert_len (string str, ssize_t len);
+-		[Version (since = "2.14")]
+-		public void clear ();
+-	}
+-
+-	/* Pointer Arrays */
+-
+-	[Compact]
+-	[Version (since = "2.22", deprecated_since = "vala-0.26", replacement="GenericArray")]
+-	[CCode (ref_function = "g_ptr_array_ref", unref_function = "g_ptr_array_unref", type_id = "G_TYPE_PTR_ARRAY")]
+-	public class PtrArray {
+-		public PtrArray ();
+-		[Version (since = "2.22")]
+-		public PtrArray.with_free_func (GLib.DestroyNotify? element_free_func);
+-		[CCode (cname = "g_ptr_array_sized_new")]
+-		public PtrArray.sized (uint reserved_size);
+-		public void add (void* data);
+-		[Version (since = "2.4")]
+-		public void foreach (GLib.Func<void*> func);
+-		[CCode (cname = "g_ptr_array_index")]
+-		public void* index(uint index);
+-		public bool remove (void* data);
+-		public void* remove_index (uint index);
+-		public bool remove_fast (void *data);
+-		public void remove_index_fast (uint index);
+-		[Version (since = "2.4")]
+-		public void remove_range (uint index, uint length);
+-		public void sort (CompareFunc<void**> compare_func);
+-		public void sort_with_data (CompareDataFunc<void**> compare_func);
+-		[Version (since = "2.22")]
+-		public void set_free_func (GLib.DestroyNotify? element_free_function);
+-		public void set_size (int length);
+-
+-		public uint len;
+-		public void** pdata;
+-	}
+-
+-	[Compact]
+-	[CCode (cname = "GPtrArray", cprefix = "g_ptr_array_", ref_function = "g_ptr_array_ref", unref_function = "g_ptr_array_unref", type_id = "G_TYPE_PTR_ARRAY")]
+-	[GIR (name = "PtrArray")]
+-	public class GenericArray<G> {
+-		[Version (since = "2.30")]
+-		[CCode (cname = "g_ptr_array_new_full", simple_generics = true)]
+-		public GenericArray (uint reserved_size = 0);
+-		public void add (owned G data);
+-		[Version (since = "2.54")]
+-		public bool find (G needle, out uint index = null);
+-		[Version (since = "2.54")]
+-		public bool find_with_equal_func (G needle, GLib.EqualFunc<G>? equal_func, out uint index = null);
+-		public void foreach (GLib.Func<G> func);
+-		[CCode (cname = "g_ptr_array_index")]
+-		public unowned G get (uint index);
+-		[Version (since = "2.40")]
+-		public void insert (int index, owned G data);
+-		public bool remove (G data);
+-		public void remove_index (uint index);
+-		public bool remove_fast (G data);
+-		public void remove_index_fast (uint index);
+-		public void remove_range (uint index, uint length);
+-		public void set (uint index, owned G data) {
+-			this.add ((owned) data);
+-			this.remove_index_fast (index);
+-		}
+-		[CCode (cname = "vala_g_ptr_array_sort")]
+-		public void sort (GLib.CompareFunc<G> compare_func) {
+-			this._sort_with_data ((a, b) => {
+-				return compare_func ((G**) (*a), (G**) (*b));
+-			});
+-		}
+-		[CCode (cname = "g_ptr_array_sort_with_data")]
+-		public void _sort_with_data (GLib.CompareDataFunc<G**> compare_func);
+-		[CCode (cname = "vala_g_ptr_array_sort_with_data")]
+-		public void sort_with_data (GLib.CompareDataFunc<G> compare_func) {
+-			this._sort_with_data ((a, b) => {
+-				return compare_func ((G**) (*a), (G**) (*b));
+-			});
+-		}
+-		[Version (since = "2.58")]
+-		public G steal_index (uint index);
+-		[Version (since = "2.58")]
+-		public G steal_index_fast (uint index);
+-
+-		private void set_size (int length);
+-
+-		public int length {
+-			get { return (int) this.len; }
+-			set { this.set_size (value); }
+-		}
+-
+-		[CCode (cname = "pdata", array_length_cname = "len", array_length_type = "guint")]
+-		public G[] data;
+-
+-		private uint len;
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.32")]
+-	[CCode (cprefix = "g_bytes_", ref_function = "g_bytes_ref", unref_function = "g_bytes_unref", type_id = "G_TYPE_BYTES")]
+-	public class Bytes {
+-		public Bytes ([CCode (array_length_type = "gsize")] uint8[] data);
+-		public Bytes.take ([CCode (array_length_type = "gsize")] owned uint8[] data);
+-		public Bytes.static ([CCode (array_length_type = "gsize")] uint8[] data);
+-		public Bytes.with_free_func ([CCode (array_length_type = "gsize")] owned uint8[] data, GLib.DestroyNotify? free_func, void* user_data);
+-		public Bytes.from_bytes (GLib.Bytes bytes, size_t offset, size_t length);
+-
+-		[CCode (cname = "g_bytes_new_with_free_func", simple_generics = true)]
+-		public static Bytes new_with_owner<T> ([CCode (array_length_type = "gsize")] uint8[] data, [CCode (destroy_notify_pos = 1.9)] owned T? owner = null);
+-
+-		[CCode (array_length_type = "gsize")]
+-		public unowned uint8[] get_data ();
+-		public size_t get_size ();
+-		public uint hash ();
+-		public int compare (GLib.Bytes bytes2);
+-		[CCode (array_length_type = "gsize")]
+-		public static uint8[] unref_to_data (owned GLib.Bytes bytes);
+-		public static GLib.ByteArray unref_to_array (owned GLib.Bytes bytes);
+-
+-		[CCode (cname = "_vala_g_bytes_get")]
+-		public uint8 get (int index) {
+-			unowned uint8[] data = this.get_data ();
+-			return data[index];
+-		}
+-
+-		[CCode (cname = "_vala_g_bytes_slice")]
+-		public GLib.Bytes slice (size_t start, size_t end) {
+-			return new GLib.Bytes.from_bytes (this, start, end - start);
+-		}
+-
+-		public int length {
+-			[CCode (cname = "_vala_g_bytes_get_length")]
+-			get {
+-				return (int) this.get_size ();
+-			}
+-		}
+-	}
+-
+-	/* Byte Arrays */
+-
+-	[Compact]
+-	[Version (since = "2.22")]
+-	[CCode (cprefix = "g_byte_array_", ref_function = "g_byte_array_ref", unref_function = "g_byte_array_unref", type_id = "G_TYPE_BYTE_ARRAY")]
+-	public class ByteArray {
+-		public ByteArray ();
+-		[CCode (cname = "g_byte_array_sized_new")]
+-		public ByteArray.sized (uint reserved_size);
+-		[Version (since = "2.32")]
+-		public ByteArray.take (owned uint8[] data);
+-		public void append (uint8[] data);
+-		[Version (since = "2.32")]
+-		public static GLib.Bytes free_to_bytes (owned GLib.ByteArray array);
+-		public void prepend (uint8[] data);
+-		public void remove_index (uint index);
+-		public void remove_index_fast (uint index);
+-		[Version (since = "2.4")]
+-		public void remove_range (uint index, uint length);
+-		public void sort (CompareFunc<int8> compare_func);
+-		public void sort_with_data (CompareDataFunc<int8> compare_func);
+-		public void set_size (uint length);
+-
+-		public uint len;
+-		[CCode (array_length_cname = "len", array_length_type = "guint")]
+-		public uint8[] data;
+-	}
+-
+-	/* N-ary Trees */
+-
+-	public delegate bool NodeTraverseFunc (Node node);
+-	public delegate void NodeForeachFunc (Node node);
+-
+-	[CCode (cprefix = "G_TRAVERSE_")]
+-	public enum TraverseFlags {
+-		LEAVES,
+-		NON_LEAVES,
+-		ALL,
+-		MASK,
+-		LEAFS,
+-		NON_LEAFS
+-	}
+-
+-	[Compact]
+-	[CCode (dup_function = "g_node_copy", free_function = "g_node_destroy")]
+-	public class Node<G> {
+-		public Node(owned G? data = null);
+-		public Node<unowned G> copy ();
+-		public Node<G> copy_deep (CopyFunc<G> copy_func);
+-		public unowned Node<G> insert (int position, owned Node<G> node);
+-		public unowned Node<G> insert_before (Node<G> sibling, owned Node<G> node);
+-		public unowned Node<G> insert_after (Node<G> sibling, owned Node<G> node);
+-		public unowned Node<G> append (owned Node<G> node);
+-		public unowned Node<G> prepend (owned Node<G> node);
+-		public unowned Node<G> insert_data (int position, owned G data);
+-		public unowned Node<G> insert_data_before (Node<G> sibling, owned G data);
+-		public unowned Node<G> append_data (owned G data);
+-		public unowned Node<G> prepend_data (owned G data);
+-		public void reverse_children ();
+-		public void traverse (TraverseType order, TraverseFlags flags, int max_depth, NodeTraverseFunc func);
+-		public void children_foreach (TraverseFlags flags, NodeForeachFunc func);
+-		public unowned Node<G> get_root ();
+-		public unowned Node<G> find (TraverseType order, TraverseFlags flags, G data);
+-		public unowned Node<G> find_child (TraverseFlags flags, G data);
+-		public int child_index (G data);
+-		public int child_position (Node<G> child);
+-		public unowned Node<G> first_child ();
+-		public unowned Node<G> last_child ();
+-		public unowned Node<G> nth_child (uint n);
+-		public unowned Node<G> first_sibling ();
+-		public unowned Node<G> next_sibling ();
+-		public unowned Node<G> prev_sibling ();
+-		public unowned Node<G> last_sibling ();
+-
+-		[CCode (cname = "G_NODE_IS_LEAF")]
+-		public bool is_leaf ();
+-		[CCode (cname = "G_NODE_IS_ROOT")]
+-		public bool is_root ();
+-		public bool is_ancestor (Node<G> descendant);
+-
+-		public uint depth ();
+-		public uint n_nodes (TraverseFlags flags);
+-		public uint n_children ();
+-		public uint max_height ();
+-
+-		[CCode (cname = "g_node_unlink")]
+-		public void _unlink ();
+-		[CCode (cname = "g_node_unlink_vala")]
+-		public Node<G> unlink ()
+-		{
+-			void *ptr = this;
+-			_unlink ();
+-			return (Node<G>) (owned) ptr;
+-		}
+-
+-		public G data;
+-		public Node next;
+-		public Node prev;
+-		public Node parent;
+-		public Node children;
+-	}
+-
+-	/* Quarks */
+-
+-	[CCode (type_id = "G_TYPE_UINT")]
+-	public struct Quark : uint32 {
+-		public static Quark from_string (string str);
+-		public static Quark try_string (string str);
+-		public unowned string to_string ();
+-	}
+-
+-	/* Keyed Data Lists */
+-
+-	[CCode (cname = "GData*")]
+-	public struct Datalist<G> {
+-		public Datalist ();
+-		public void clear ();
+-		[Version (since = "2.34")]
+-		public G id_dup_data (Quark key_id, DuplicateFunc<G> dup_func);
+-		public unowned G id_get_data (Quark key_id);
+-		public void id_set_data (Quark key_id, owned G data);
+-		public void id_set_data_full (Quark key_id, owned G data, DestroyNotify? destroy_func);
+-		public void id_remove_data (Quark key_id);
+-		public G id_remove_no_notify (Quark key_id);
+-		[Version (since = "2.34")]
+-		public bool id_replace_data (Quark key_id, G oldval, owned G newval, GLib.DestroyNotify? destroy, out GLib.DestroyNotify? old_destroy);
+-		public void @foreach (DataForeachFunc<G> func);
+-		public unowned G get_data (string key);
+-		public void set_data_full (string key, owned G data, DestroyNotify? destry_func);
+-		public G remove_no_notify (string key);
+-		public void set_data (string key, owned G data);
+-		public void remove_data (string key);
+-	}
+-
+-	public delegate void DataForeachFunc<G> (Quark key_id, G data);
+-	public delegate G DuplicateFunc<G> (G data);
+-
+-	/* GArray */
+-
+-	[Compact]
+-	[Version (since = "2.22")]
+-	[CCode (ref_function = "g_array_ref", unref_function = "g_array_unref", type_id = "G_TYPE_ARRAY")]
+-	public class Array<G> {
+-		[CCode (cname = "len")]
+-		public uint length;
+-		[CCode (cname = "data", array_length_cname = "len", array_length_type = "uint")]
+-		public G[] data;
+-
+-		public Array (bool zero_terminated = true, bool clear = true, ulong element_size = 0);
+-		[CCode (cname = "g_array_sized_new")]
+-		public Array.sized (bool zero_terminated, bool clear, ulong element_size, uint reserved_size);
+-		public void append_val (owned G value);
+-		public void append_vals (void* data, uint len);
+-		public void prepend_val (owned G value);
+-		public void prepend_vals (void* data, uint len);
+-		public void insert_val (uint index, owned G value);
+-		public void insert_vals (uint index, void* data, uint len);
+-		[CCode (cname = "g_array_remove_index")]
+-		public void _remove_index (uint index);
+-		[CCode (cname = "g_array_remove_index_fast")]
+-		public void _remove_index_fast (uint index);
+-		[CCode (cname = "g_array_remove_range")]
+-		public void _remove_range (uint index, uint length);
+-		[CCode (cname = "vala_g_array_remove_index")]
+-		public G remove_index (uint index) {
+-			assert (length > index);
+-			G g = (owned) data[index];
+-			_remove_index (index);
+-			return g;
+-		}
+-		[CCode (cname = "vala_g_array_remove_index_fast")]
+-		public G remove_index_fast (uint index) {
+-			assert (length > index);
+-			G g = (owned) data[index];
+-			_remove_index_fast (index);
+-			return g;
+-		}
+-		[CCode (cname = "vala_g_array_remove_range")]
+-		public G[] remove_range (uint index, uint length) {
+-			assert (this.length >= index + length);
+-			G[] ga = new G[length];
+-			for (uint i = 0; i < length; i++) {
+-				ga[i] = (owned) data[i + index];
+-			}
+-			_remove_range (index, length);
+-			return ga;
+-		}
+-		public void sort (CompareFunc<G> compare_func);
+-		public void sort_with_data (CompareDataFunc<G> compare_func);
+-		[CCode (generic_type_pos = 0.1)]
+-		public unowned G index (uint index);
+-		public void set_size (uint length);
+-		[Version (since = "2.32")]
+-		public void set_clear_func (GLib.DestroyNotify clear_func);
+-	}
+-
+-	/* GTree */
+-
+-	public delegate bool TraverseFunc<K,V> (K key, V value);
+-
+-	[CCode (cprefix = "G_", has_type_id = false)]
+-	public enum TraverseType {
+-		IN_ORDER,
+-		PRE_ORDER,
+-		POST_ORDER,
+-		LEVEL_ORDER
+-	}
+-
+-	public delegate int TreeSearchFunc<K> (K key);
+-
+-	[Compact]
+-	[Version (since = "2.22")]
+-	[CCode (ref_function = "g_tree_ref", unref_function = "g_tree_unref")]
+-	public class Tree<K,V> {
+-		[CCode (cname = "g_tree_new_full", simple_generics = true)]
+-		public Tree (CompareDataFunc<K> key_compare_func);
+-		[Version (deprecated_since = "vala-0.20", replacement = "Tree ()")]
+-		public Tree.with_data (CompareDataFunc<K> key_compare_func);
+-		public Tree.full (CompareDataFunc<K> key_compare_func, DestroyNotify? key_destroy_func, DestroyNotify? value_destroy_func);
+-		public void insert (owned K key, owned V value);
+-		public void replace (owned K key, owned V value);
+-		public int nnodes ();
+-		public int height ();
+-		public unowned V lookup (K key);
+-		public bool lookup_extended (K lookup_key, out unowned K orig_key, out unowned V value);
+-		public void foreach (TraverseFunc<K,V> traverse_func);
+-		public unowned V search (TreeSearchFunc<K> search_func);
+-		[CCode (cname = "g_tree_search")]
+-		public unowned V search_key (CompareFunc<K> search_func, K key);
+-		public bool remove (K key);
+-		public bool steal (K key);
+-	}
+-
+-	/* Internationalization */
+-
+-	[Version (since = "2.4")]
+-	[CCode (cname = "_", cheader_filename = "glib.h,glib/gi18n-lib.h")]
+-	public static unowned string _ ([FormatArg] string str);
+-	[Version (since = "2.4")]
+-	[CCode (cname = "Q_", cheader_filename = "glib.h,glib/gi18n-lib.h")]
+-	public static unowned string Q_ ([FormatArg] string str);
+-	[Version (since = "2.4")]
+-	[CCode (cname = "N_", cheader_filename = "glib.h,glib/gi18n-lib.h")]
+-	public static unowned string N_ ([FormatArg] string str);
+-	[Version (since = "2.16")]
+-	[CCode (cname = "C_", cheader_filename = "glib.h,glib/gi18n-lib.h")]
+-	public static unowned string C_ (string context, [FormatArg] string str);
+-	[Version (since = "2.18")]
+-	[CCode (cname = "NC_", cheader_filename = "glib.h,glib/gi18n-lib.h")]
+-	public static unowned string NC_ (string context, [FormatArg] string str);
+-	[CCode (cname = "ngettext", cheader_filename = "glib.h,glib/gi18n-lib.h")]
+-	public static unowned string ngettext (string msgid, [FormatArg] string msgid_plural, ulong n);
+-	[Version (since = "2.18")]
+-	[CCode (cname = "g_dgettext", cheader_filename = "glib/gi18n-lib.h")]
+-	public static unowned string dgettext (string? domain, [FormatArg] string msgid);
+-	[Version (since = "2.26")]
+-	[CCode (cname = "g_dcgettext", cheader_filename = "glib/gi18n-lib.h")]
+-	public static unowned string dcgettext (string? domain, [FormatArg] string msgid, int category);
+-	[Version (since = "2.18")]
+-	[CCode (cname = "g_dngettext", cheader_filename = "glib/gi18n-lib.h")]
+-	public static unowned string dngettext (string? domain, string msgid, [FormatArg] string msgid_plural, ulong n);
+-	[Version (since = "2.16")]
+-	[CCode (cname = "g_dpgettext", cheader_filename = "glib/gi18n-lib.h")]
+-	public static unowned string dpgettext (string? domain, [FormatArg] string msgctxid, size_t msgidoffset);
+-	[Version (since = "2.18")]
+-	[CCode (cname = "g_dpgettext2", cheader_filename = "glib/gi18n-lib.h")]
+-	public static unowned string dpgettext2 (string? domain, string context, [FormatArg] string msgid);
+-
+-	[CCode (cname = "int", cprefix = "LC_", cheader_filename = "locale.h", has_type_id = false)]
+-	public enum LocaleCategory {
+-		ALL,
+-		COLLATE,
+-		CTYPE,
+-		MESSAGES,
+-		MONETARY,
+-		NUMERIC,
+-		TIME
+-	}
+-
+-	namespace Intl {
+-		[CCode (cname = "setlocale", cheader_filename = "locale.h")]
+-		public static unowned string? setlocale (LocaleCategory category = GLib.LocaleCategory.ALL, string? locale = "");
+-		[CCode (cname = "bindtextdomain", cheader_filename = "glib/gi18n-lib.h")]
+-		public static unowned string? bindtextdomain (string domainname, string? dirname);
+-		[CCode (cname = "textdomain", cheader_filename = "glib/gi18n-lib.h")]
+-		public static unowned string? textdomain (string? domainname);
+-		[CCode (cname = "bind_textdomain_codeset", cheader_filename = "glib/gi18n-lib.h")]
+-		public static unowned string? bind_textdomain_codeset (string domainname, string? codeset);
+-		[Version (since = "2.6")]
+-		[CCode (cname = "g_get_language_names", array_length = false, array_null_terminated = true)]
+-		public static unowned string[] get_language_names ();
+-		[Version (since = "2.58")]
+-		[CCode (cname = "g_get_language_names_with_category", array_length = false, array_null_terminated = true)]
+-		public static unowned string[] get_language_names_with_category (string category_name);
+-		[Version (since = "2.4")]
+-		[CCode (cname = "g_strip_context", cheader_filename = "glib/gi18n-lib.h")]
+-		public static unowned string strip_context (string msgid, string msgval);
+-	}
+-
+-	[Compact]
+-	public class PatternSpec {
+-		public PatternSpec (string pattern);
+-		public bool equal (PatternSpec pspec);
+-		[CCode (cname = "g_pattern_match")]
+-		public bool match (uint string_length, string str, string? str_reversed);
+-		[CCode (cname = "g_pattern_match_string")]
+-		public bool match_string (string str);
+-		[CCode (cname = "g_pattern_match_simple")]
+-		public static bool match_simple (string pattern, string str);
+-	}
+-
+-	[CCode (lower_case_cprefix = "glib_version_")]
+-	namespace Version {
+-		[CCode (cname = "glib_major_version")]
+-		public const uint major;
+-		[CCode (cname = "glib_minor_version")]
+-		public const uint minor;
+-		[CCode (cname = "glib_micro_version")]
+-		public const uint micro;
+-		[CCode (cname = "glib_check_version")]
+-		public static unowned string? check (uint required_major, uint required_minor = 0, uint required_micro = 0);
+-
+-		[CCode (cname = "GLIB_MAJOR_VERSION")]
+-		public const uint MAJOR;
+-		[CCode (cname = "GLIB_MINOR_VERSION")]
+-		public const uint MINOR;
+-		[CCode (cname = "GLIB_MICRO_VERSION")]
+-		public const uint MICRO;
+-		[CCode (cname = "GLIB_CHECK_VERSION")]
+-		public static bool CHECK (uint required_major, uint required_minor = 0, uint required_micro = 0);
+-
+-		[CCode (cname = "G_ENCODE_VERSION")]
+-		public static uint encode (uint major, uint minor);
+-
+-		public const uint CUR_STABLE;
+-		public const uint PREV_STABLE;
+-		public const uint MIN_REQUIRED;
+-		public const uint MAX_ALLOWED;
+-
+-		public const uint @2_26;
+-		public const uint @2_28;
+-		public const uint @2_30;
+-		public const uint @2_32;
+-		public const uint @2_34;
+-		public const uint @2_36;
+-		public const uint @2_38;
+-		public const uint @2_40;
+-		public const uint @2_42;
+-		public const uint @2_44;
+-		public const uint @2_46;
+-		public const uint @2_48;
+-		public const uint @2_50;
+-		public const uint @2_52;
+-		public const uint @2_54;
+-		public const uint @2_56;
+-		public const uint @2_58;
+-
+-		[CCode (cname = "glib_binary_age")]
+-		public const uint binary_age;
+-		[CCode (cname = "glib_interface_age")]
+-		public const uint interface_age;
+-	}
+-
+-	namespace Win32 {
+-		public enum OSType {
+-			[CCode (cname = "G_WIN32_OS_ANY")]
+-			ANY,
+-			[CCode (cname = "G_WIN32_OS_WORKSTATION")]
+-			WORKSTATION,
+-			[CCode (cname = "G_WIN32_OS_SERVER")]
+-			SERVER,
+-		}
+-		[Version (since = "2.44")]
+-		public bool check_windows_version (int major, int minor, int spver, GLib.Win32.OSType os_type);
+-
+-		public string error_message (int error);
+-		public string getlocale ();
+-		[Version (since = "2.16")]
+-		public string get_package_installation_directory_of_module (void* hmodule);
+-		public uint get_windows_version ();
+-		[Version (since = "2.8")]
+-		public string locale_filename_from_utf8 (string utf8filename);
+-		[CCode (cname = "G_WIN32_HAVE_WIDECHAR_API")]
+-		public bool have_widechar_api ();
+-		[CCode (cname = "G_WIN32_IS_NT_BASED")]
+-		public bool is_nt_based ();
+-		[Version (since = "2.40")]
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] get_command_line ();
+-	}
+-
+-	[Compact]
+-	[Immutable]
+-	[Version (since = "2.24")]
+-	[CCode (copy_function = "g_variant_type_copy", free_function = "g_variant_type_free", type_id = "G_TYPE_VARIANT_TYPE")]
+-	public class VariantType {
+-		[CCode (cname = "G_VARIANT_TYPE_BOOLEAN")]
+-		public static VariantType BOOLEAN;
+-		[CCode (cname = "G_VARIANT_TYPE_BYTE")]
+-		public static VariantType BYTE;
+-		[CCode (cname = "G_VARIANT_TYPE_INT16")]
+-		public static VariantType INT16;
+-		[CCode (cname = "G_VARIANT_TYPE_UINT16")]
+-		public static VariantType UINT16;
+-		[CCode (cname = "G_VARIANT_TYPE_INT32")]
+-		public static VariantType INT32;
+-		[CCode (cname = "G_VARIANT_TYPE_UINT32")]
+-		public static VariantType UINT32;
+-		[CCode (cname = "G_VARIANT_TYPE_INT64")]
+-		public static VariantType INT64;
+-		[CCode (cname = "G_VARIANT_TYPE_UINT64")]
+-		public static VariantType UINT64;
+-		[CCode (cname = "G_VARIANT_TYPE_HANDLE")]
+-		public static VariantType HANDLE;
+-		[CCode (cname = "G_VARIANT_TYPE_DOUBLE")]
+-		public static VariantType DOUBLE;
+-		[CCode (cname = "G_VARIANT_TYPE_STRING")]
+-		public static VariantType STRING;
+-		[CCode (cname = "G_VARIANT_TYPE_OBJECT_PATH")]
+-		public static VariantType OBJECT_PATH;
+-		[CCode (cname = "G_VARIANT_TYPE_SIGNATURE")]
+-		public static VariantType SIGNATURE;
+-		[CCode (cname = "G_VARIANT_TYPE_VARIANT")]
+-		public static VariantType VARIANT;
+-		[CCode (cname = "G_VARIANT_TYPE_UNIT")]
+-		public static VariantType UNIT;
+-		[CCode (cname = "G_VARIANT_TYPE_ANY")]
+-		public static VariantType ANY;
+-		[CCode (cname = "G_VARIANT_TYPE_BASIC")]
+-		public static VariantType BASIC;
+-		[CCode (cname = "G_VARIANT_TYPE_MAYBE")]
+-		public static VariantType MAYBE;
+-		[CCode (cname = "G_VARIANT_TYPE_ARRAY")]
+-		public static VariantType ARRAY;
+-		[CCode (cname = "G_VARIANT_TYPE_TUPLE")]
+-		public static VariantType TUPLE;
+-		[CCode (cname = "G_VARIANT_TYPE_DICT_ENTRY")]
+-		public static VariantType DICT_ENTRY;
+-		[CCode (cname = "G_VARIANT_TYPE_DICTIONARY")]
+-		public static VariantType DICTIONARY;
+-		[CCode (cname = "G_VARIANT_TYPE_STRING_ARRAY")]
+-		public static VariantType STRING_ARRAY;
+-		[CCode (cname = "G_VARIANT_TYPE_OBJECT_PATH_ARRAY")]
+-		public static VariantType OBJECT_PATH_ARRAY;
+-		[CCode (cname = "G_VARIANT_TYPE_BYTESTRING")]
+-		public static VariantType BYTESTRING;
+-		[CCode (cname = "G_VARIANT_TYPE_BYTESTRING_ARRAY")]
+-		public static VariantType BYTESTRING_ARRAY;
+-		[Version (since = "2.30")]
+-		[CCode (cname = "G_VARIANT_TYPE_VARDICT")]
+-		public static VariantType VARDICT;
+-
+-		public static bool string_is_valid (string type_string);
+-		public static bool string_scan (string type_string, char *limit, out char* endptr);
+-
+-		public VariantType (string type_string);
+-		public size_t get_string_length ();
+-		public char* peek_string ();
+-		public string dup_string ();
+-
+-		public bool is_definite ();
+-		public bool is_container ();
+-		public bool is_basic ();
+-		public bool is_maybe ();
+-		public bool is_array ();
+-		public bool is_tuple ();
+-		public bool is_dict_entry ();
+-		public bool is_variant ();
+-
+-		public uint hash ();
+-		public bool equal (VariantType other);
+-		public bool is_subtype_of (VariantType supertype);
+-
+-		public unowned VariantType element ();
+-		public unowned VariantType first ();
+-		public unowned VariantType next ();
+-		public unowned VariantType n_items ();
+-		public unowned VariantType key ();
+-		public unowned VariantType value ();
+-
+-		public VariantType.array (VariantType element);
+-		public VariantType.maybe (VariantType element);
+-		public VariantType.tuple (VariantType[] items);
+-		public VariantType.dict_entry (VariantType key, VariantType value);
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.24")]
+-	[CCode (ref_function = "g_variant_ref", unref_function = "g_variant_unref", ref_sink_function = "g_variant_ref_sink", type_id = "G_TYPE_VARIANT", marshaller_type_name = "VARIANT", param_spec_function = "g_param_spec_variant", get_value_function = "g_value_get_variant", set_value_function = "g_value_set_variant", take_value_function = "g_value_take_variant", type_signature = "v")]
+-	public class Variant {
+-		[CCode (has_type_id = false)]
+-		public enum Class {
+-			BOOLEAN, BYTE, INT16, UINT16, INT32, UINT32, INT64,
+-			UINT64, HANDLE, DOUBLE, STRING, OBJECT_PATH,
+-			SIGNATURE, VARIANT, MAYBE, ARRAY, TUPLE, DICT_ENTRY
+-		}
+-
+-		public unowned VariantType get_type ();
+-		public unowned string get_type_string ();
+-		public bool is_of_type (VariantType type);
+-		public bool is_container ();
+-		[Version (since = "2.26")]
+-		public bool is_floating ();
+-		public Class classify ();
+-		[Version (since = "2.26")]
+-		public int compare (Variant other);
+-
+-		public Variant.boolean (bool value);
+-		public Variant.byte (uint8 value);
+-		public Variant.int16 (int16 value);
+-		public Variant.uint16 (uint16 value);
+-		public Variant.int32 (int32 value);
+-		public Variant.uint32 (uint32 value);
+-		public Variant.int64 (int64 value);
+-		public Variant.uint64 (uint64 value);
+-		public Variant.handle (int32 value);
+-		public Variant.double (double value);
+-		public Variant.string (string value);
+-		[Version (since = "2.26")]
+-		public Variant.bytestring (string value);
+-		public Variant.object_path (string object_path);
+-		public static bool is_object_path (string object_path);
+-		public Variant.signature (string signature);
+-		public static bool is_signature (string signature);
+-
+-		public bool get_boolean ();
+-		public uint8 get_byte ();
+-		public int16 get_int16 ();
+-		public uint16 get_uint16 ();
+-		public int32 get_int32 ();
+-		public uint32 get_uint32 ();
+-		public int64 get_int64 ();
+-		public uint64 get_uint64 ();
+-		public int32 get_handle ();
+-		public double get_double ();
+-		public unowned string get_string (out size_t length = null);
+-		public string dup_string (out size_t length = null);
+-		[Version (since = "2.26")]
+-		public unowned string get_bytestring ();
+-		[Version (since = "2.26")]
+-		public string dup_bytestring (out size_t length);
+-
+-		public Variant.strv (string[] value);
+-		[CCode (array_length_type = "size_t")]
+-#if VALA_0_26
+-		public (unowned string)[] get_strv ();
+-#else
+-		public string*[] get_strv ();
+-#endif
+-		[CCode (array_length_type = "size_t")]
+-		public string[] dup_strv ();
+-
+-		[Version (since = "2.26")]
+-		public Variant.bytestring_array (string[] value);
+-		[Version (since = "2.26")]
+-		[CCode (array_length_type = "size_t")]
+-#if VALA_0_26
+-		public (unowned string)[] get_bytestring_array ();
+-#else
+-		public string*[] get_bytestring_array ();
+-#endif
+-		[Version (since = "2.26")]
+-		[CCode (array_length_type = "size_t")]
+-		public string[] dup_bytestring_array ();
+-
+-		[Version (since = "2.30")]
+-		public Variant.objv (string[] value);
+-		[Version (since = "2.30")]
+-		[CCode (array_length_type = "size_t")]
+-#if VALA_0_26
+-		public (unowned string)[] get_objv ();
+-#else
+-		public string*[] get_objv ();
+-#endif
+-		[Version (since = "2.30")]
+-		[CCode (array_length_type = "size_t")]
+-		public string[] dup_objv ();
+-
+-		public Variant (string format, ...);
+-		// note: the function changes its behaviour when end_ptr is null, so 'out char *' is wrong
+-		public Variant.va (string format, char **end_ptr, va_list *app);
+-		public void get (string format, ...);
+-		public void get_va (string format, char **end_ptr, va_list *app);
+-
+-		public Variant.variant (Variant value);
+-		public Variant.maybe (VariantType? child_type, Variant? child);
+-		public Variant.array (VariantType? child_type, Variant[] children);
+-		[Version (since = "2.32")]
+-		[CCode (simple_generics = true)]
+-		public static Variant new_fixed_array<T> (VariantType? element_type, [CCode (array_length_type = "gsize")] T[] elements, size_t element_size);
+-		public Variant.tuple (Variant[] children);
+-		public Variant.dict_entry (Variant key, Variant value);
+-		public Variant get_variant ();
+-		public Variant? get_maybe ();
+-
+-		public size_t n_children ();
+-		public Variant get_child_value (size_t index);
+-		public void get_child (size_t index, string format_string, ...);
+-
+-		[Version (since = "2.28")]
+-		public Variant? lookup_value (string key, VariantType? expected_type);
+-		[Version (since = "2.28")]
+-		public bool lookup (string key, string format_string, ...);
+-
+-		public size_t get_size ();
+-		public void *get_data ();
+-		public void store (void *data);
+-
+-		public string print (bool type_annotate);
+-		public StringBuilder print_string (StringBuilder? builder, bool type_annotate);
+-
+-		public uint hash ();
+-		public bool equal (Variant other);
+-
+-		public Variant byteswap ();
+-		public Variant get_normal_form ();
+-		public bool is_normal_form ();
+-		[CCode (returns_floating_reference = true, simple_generics = true)]
+-		public static Variant new_from_data<T> (VariantType type, uchar[] data, bool trusted, [CCode (destroy_notify_pos = 3.9)] owned T? owner = null);
+-
+-		[CCode (cname = "g_variant_iter_new")]
+-		public VariantIter iterator ();
+-
+-		public static Variant parse (VariantType? type, string text, char *limit = null, char **endptr = null) throws GLib.VariantParseError;
+-		public Variant.parsed (string format_string, ...);
+-
+-		[Version (since = "2.34")]
+-		public bool check_format_string (string format_string, bool copy_only);
+-
+-		[Version (since = "2.36")]
+-		public Variant.from_bytes (VariantType type, Bytes bytes, bool trusted);
+-		[Version (since = "2.36")]
+-		public Bytes get_data_as_bytes ();
+-
+-		[Version (since = "2.38")]
+-		public Variant.printf (string format_string, ...);
+-		[Version (since = "2.38")]
+-		public Variant.take_string (owned string str);
+-
+-		[Version (since = "2.40")]
+-		public static void parse_error_print_context (GLib.VariantParseError error, string source_str);
+-	}
+-
+-	[Version (since = "2.24")]
+-	public errordomain VariantParseError {
+-		FAILED,
+-		BASIC_TYPE_EXPECTED,
+-		CANNOT_INFER_TYPE,
+-		DEFINITE_TYPE_EXPECTED,
+-		INPUT_NOT_AT_END,
+-		INVALID_CHARACTER,
+-		INVALID_FORMAT_STRING,
+-		INVALID_OBJECT_PATH,
+-		INVALID_SIGNATURE,
+-		INVALID_TYPE_STRING,
+-		NO_COMMON_TYPE,
+-		NUMBER_OUT_OF_RANGE,
+-		NUMBER_TOO_BIG,
+-		TYPE_ERROR,
+-		UNEXPECTED_TOKEN,
+-		UNKNOWN_KEYWORD,
+-		UNTERMINATED_STRING_CONSTANT,
+-		VALUE_EXPECTED;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.24")]
+-	public class VariantIter {
+-		public VariantIter (Variant value);
+-		public size_t n_children ();
+-		public Variant? next_value ();
+-		public bool next (string format_string, ...);
+-	}
+-
+-	[Compact]
+-	[Version (since = "2.24")]
+-	[CCode (ref_function = "g_variant_builder_ref", unref_function = "g_variant_builder_unref")]
+-	public class VariantBuilder {
+-		public VariantBuilder (VariantType type);
+-		public void open (VariantType type);
+-		public void close ();
+-		public void add_value (Variant value);
+-		public void add (string format_string, ...);
+-		[CCode (returns_floating_reference = true)]
+-		public Variant end ();
+-	}
+-
+-	[Version (since = "2.40")]
+-	[Compact, CCode (ref_function = "g_variant_dict_ref", unref_function = "g_variant_dict_unref")]
+-	public class VariantDict {
+-		public VariantDict (GLib.Variant? from_asv = null);
+-		public bool lookup (string key, string format_string, ...);
+-		public GLib.Variant lookup_value (string key, GLib.VariantType expected_type);
+-		public bool contains (string key);
+-		public void insert (string key, string format_string, ...);
+-		public void insert_value (string key, GLib.Variant value);
+-		public bool remove (string key);
+-		public void clear ();
+-		[CCode (returns_floating_reference = true)]
+-		public GLib.Variant end ();
+-	}
+-
+-	[CCode (cname = "char", const_cname = "const char", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "G_TYPE_STRING", marshaller_type_name = "STRING", param_spec_function = "g_param_spec_string", get_value_function = "g_value_get_string", set_value_function = "g_value_set_string", take_value_function = "g_value_take_string", type_signature = "o")]
+-	public class ObjectPath : string {
+-		[CCode (cname = "g_strdup")]
+-		public ObjectPath (string path);
+-	}
+-
+-	[CCode (cname = "char", const_cname = "const char", copy_function = "g_strdup", free_function = "g_free", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "G_TYPE_STRING", marshaller_type_name = "STRING", param_spec_function = "g_param_spec_string", get_value_function = "g_value_get_string", set_value_function = "g_value_set_string", take_value_function = "g_value_take_string")]
+-	public class BusName : string {
+-		[CCode (cname = "g_strdup")]
+-		public BusName (string bus_name);
+-	}
+-
+-	[CCode (cname = "G_LIKELY", cheader_filename = "glib.h")]
+-	public static bool likely (bool expression);
+-	[CCode (cname = "G_UNLIKELY", cheader_filename = "glib.h")]
+-	public static bool unlikely (bool expression);
+-	[Version (since = "2.20")]
+-	[CCode (cname = "G_STATIC_ASSERT", cheader_filename = "glib.h")]
+-	public static void static_assert (bool expression);
+-
+-	[CCode (simple_generics = true, cname = "g_qsort_with_data")]
+-	private static void _qsort_with_data<T> (T[] elems, size_t size, [CCode (type = "GCompareDataFunc")] GLib.CompareDataFunc<T> compare_func);
+-
+-	[CCode (cname = "_vala_g_qsort_with_data")]
+-	public static void qsort_with_data<T> (T[] elems, size_t size, [CCode (type = "GCompareDataFunc")] GLib.CompareDataFunc<T> compare_func) {
+-		_qsort_with_data<T*> (elems, size, (a, b) => {
+-				return compare_func (*a, *b);
+-			});
+-	}
+-
+-	[Version (since = "2.54")]
+-	public errordomain NumberParserError {
+-		INVALID,
+-		OUT_OF_BOUNDS;
+-		public static GLib.Quark quark ();
+-	}
+-
+-	/* Unix-specific functions. All of these have to include glib-unix.h. */
+-	namespace Unix {
+-		[Version (since = "2.30")]
+-		[CCode (cheader_filename = "glib-unix.h", cname = "g_unix_signal_add_full")]
+-		public static uint signal_add (int signum, owned GLib.SourceFunc handler, [CCode (pos = 0.9)] int priority = Priority.DEFAULT);
+-
+-		[CCode (cheader_filename = "glib-unix.h", cname = "GSource")]
+-		public class SignalSource : GLib.Source {
+-			public SignalSource (int signum);
+-		}
+-
+-		[Version (since = "2.30")]
+-		[CCode (cheader_filename = "glib-unix.h")]
+-		public static bool open_pipe ([CCode (array_length = false, array_null_terminated = false)] int[] fds, int flags) throws GLib.Error;
+-		[Version (since = "2.30")]
+-		[CCode (cheader_filename = "glib-unix.h")]
+-		public static bool set_fd_nonblocking (int fd, bool nonblock) throws GLib.Error;
+-	}
+-
+-	[CCode (cname = "GUnicodeScript", cprefix = "G_UNICODE_SCRIPT_", has_type_id = false)]
+-	public enum UnicodeScript {
+-		INVALID_CODE,
+-		COMMON,
+-		INHERITED,
+-		ARABIC,
+-		ARMENIAN,
+-		BENGALI,
+-		BOPOMOFO,
+-		CHEROKEE,
+-		COPTIC,
+-		CYRILLIC,
+-		DESERET,
+-		DEVANAGARI,
+-		ETHIOPIC,
+-		GEORGIAN,
+-		GOTHIC,
+-		GREEK,
+-		GUJARATI,
+-		GURMUKHI,
+-		HAN,
+-		HANGUL,
+-		HEBREW,
+-		HIRAGANA,
+-		KANNADA,
+-		KATAKANA,
+-		KHMER,
+-		LAO,
+-		LATIN,
+-		MALAYALAM,
+-		MONGOLIAN,
+-		MYANMAR,
+-		OGHAM,
+-		OLD_ITALIC,
+-		ORIYA,
+-		RUNIC,
+-		SINHALA,
+-		SYRIAC,
+-		TAMIL,
+-		TELUGU,
+-		THAANA,
+-		THAI,
+-		TIBETAN,
+-		CANADIAN_ABORIGINAL,
+-		YI,
+-		TAGALOG,
+-		HANUNOO,
+-		BUHID,
+-		TAGBANWA,
+-
+-		BRAILLE,
+-		CYPRIOT,
+-		LIMBU,
+-		OSMANYA,
+-		SHAVIAN,
+-		LINEAR_B,
+-		TAI_LE,
+-		UGARITIC,
+-
+-		NEW_TAI_LUE,
+-		BUGINESE,
+-		GLAGOLITIC,
+-		TIFINAGH,
+-		SYLOTI_NAGRI,
+-		OLD_PERSIAN,
+-		KHAROSHTHI,
+-
+-		UNKNOWN,
+-		BALINESE,
+-		CUNEIFORM,
+-		PHOENICIAN,
+-		PHAGS_PA,
+-		NKO,
+-
+-		KAYAH_LI,
+-		LEPCHA,
+-		REJANG,
+-		SUNDANESE,
+-		SAURASHTRA,
+-		CHAM,
+-		OL_CHIKI,
+-		VAI,
+-		CARIAN,
+-		LYCIAN,
+-		LYDIAN,
+-
+-		/* Unicode-5.2 additions */
+-		AVESTAN,                /* Avst */
+-		BAMUM,                  /* Bamu */
+-		EGYPTIAN_HIEROGLYPHS,   /* Egyp */
+-		IMPERIAL_ARAMAIC,       /* Armi */
+-		INSCRIPTIONAL_PAHLAVI,  /* Phli */
+-		INSCRIPTIONAL_PARTHIAN, /* Prti */
+-		JAVANESE,               /* Java */
+-		KAITHI,                 /* Kthi */
+-		LISU,                   /* Lisu */
+-		MEETEI_MAYEK,           /* Mtei */
+-		OLD_SOUTH_ARABIAN,      /* Sarb */
+-		OLD_TURKIC,             /* Orkh */
+-		SAMARITAN,              /* Samr */
+-		TAI_THAM,               /* Lana */
+-		TAI_VIET,               /* Tavt */
+-
+-		/* Unicode-6.0 additions */
+-		BATAK,                  /* Batk */
+-		BRAHMI,                 /* Brah */
+-		MANDAIC,                /* Mand */
+-
+-		/* Unicode-6.1 additions */
+-		CHAKMA,                 /* Cakm */
+-		MEROITIC_CURSIVE,       /* Merc */
+-		MEROITIC_HIEROGLYPHS,   /* Mero */
+-		MIAO,                   /* Plrd */
+-		SHARADA,                /* Shrd */
+-		SORA_SOMPENG,           /* Sora */
+-		TAKRI,                  /* Takr */
+-
+-		/* Unicode 7.0 additions */
+-		BASSA_VAH,              /* Bass */
+-		CAUCASIAN_ALBANIAN,     /* Aghb */
+-		DUPLOYAN,               /* Dupl */
+-		ELBASAN,                /* Elba */
+-		GRANTHA,                /* Gran */
+-		KHOJKI,                 /* Khoj */
+-		KHUDAWADI,              /* Sind */
+-		LINEAR_A,               /* Lina */
+-		MAHAJANI,               /* Mahj */
+-		MANICHAEAN,             /* Manu */
+-		MENDE_KIKAKUI,          /* Mend */
+-		MODI,                   /* Modi */
+-		MRO,                    /* Mroo */
+-		NABATAEAN,              /* Nbat */
+-		OLD_NORTH_ARABIAN,      /* Narb */
+-		OLD_PERMIC,             /* Perm */
+-		PAHAWH_HMONG,           /* Hmng */
+-		PALMYRENE,              /* Palm */
+-		PAU_CIN_HAU,            /* Pauc */
+-		PSALTER_PAHLAVI,        /* Phlp */
+-		SIDDHAM,                /* Sidd */
+-		TIRHUTA,                /* Tirh */
+-		WARANG_CITI,            /* Wara */
+-
+-		/* Unicode 8.0 additions */
+-		AHOM,                   /* Ahom */
+-		ANATOLIAN_HIEROGLYPHS,  /* Hluw */
+-		HATRAN,                 /* Hatr */
+-		MULTANI,                /* Mult */
+-		OLD_HUNGARIAN,          /* Hung */
+-		SIGNWRITING,            /* Sgnw */
+-
+-		/* Unicode 9.0 additions */
+-		ADLAM,                  /* Adlm */
+-		BHAIKSUKI,              /* Bhks */
+-		MARCHEN,                /* Marc */
+-		NEWA,                   /* Newa */
+-		OSAGE,                  /* Osge */
+-		TANGUT,                 /* Tang */
+-
+-		/* Unicode 10.0 additions */
+-		MASARAM_GONDI,          /* Gonm */
+-		NUSHU,                  /* Nshu */
+-		SOYOMBO,                /* Soyo */
+-		ZANABAZAR_SQUARE,       /* Zanb */
+-
+-		/* Unicode 11.0 additions */
+-		DOGRA,                  /* Dogr */
+-		GUNJALA_GONDI,          /* Gong */
+-		HANIFI_ROHINGYA,        /* Rohg */
+-		MAKASAR,                /* Maka */
+-		MEDEFAIDRIN,            /* Medf */
+-		OLD_SOGDIAN,            /* Sogo */
+-		SOGDIAN;                /* Sogd */
+-
+-		[CCode (cname = "g_unicode_script_to_iso15924")]
+-		public uint32 to_iso15924 ();
+-		[CCode (cname = "g_unicode_script_from_iso15924")]
+-		public static GLib.UnicodeScript from_iso15924 (uint32 iso15924);
+-	}
+-
+-	[CCode (cname = "GUnicodeType", cprefix = "G_UNICODE_", has_type_id = false)]
+-	public enum UnicodeType {
+-		CONTROL,
+-		FORMAT,
+-		UNASSIGNED,
+-		PRIVATE_USE,
+-		SURROGATE,
+-		LOWERCASE_LETTER,
+-		MODIFIER_LETTER,
+-		OTHER_LETTER,
+-		TITLECASE_LETTER,
+-		UPPERCASE_LETTER,
+-		COMBINING_MARK,
+-		ENCLOSING_MARK,
+-		NON_SPACING_MARK,
+-		DECIMAL_NUMBER,
+-		LETTER_NUMBER,
+-		OTHER_NUMBER,
+-		CONNECT_PUNCTUATION,
+-		DASH_PUNCTUATION,
+-		CLOSE_PUNCTUATION,
+-		FINAL_PUNCTUATION,
+-		INITIAL_PUNCTUATION,
+-		OTHER_PUNCTUATION,
+-		OPEN_PUNCTUATION,
+-		CURRENCY_SYMBOL,
+-		MODIFIER_SYMBOL,
+-		MATH_SYMBOL,
+-		OTHER_SYMBOL,
+-		LINE_SEPARATOR,
+-		PARAGRAPH_SEPARATOR,
+-		SPACE_SEPARATOR
+-	}
+-
+-	[CCode (cname = "GUnicodeBreakType", cprefix = "G_UNICODE_BREAK_", has_type_id = false)]
+-	public enum UnicodeBreakType {
+-		MANDATORY,
+-		CARRIAGE_RETURN,
+-		LINE_FEED,
+-		COMBINING_MARK,
+-		SURROGATE,
+-		ZERO_WIDTH_SPACE,
+-		INSEPARABLE,
+-		NON_BREAKING_GLUE,
+-		CONTINGENT,
+-		SPACE,
+-		AFTER,
+-		BEFORE,
+-		BEFORE_AND_AFTER,
+-		HYPHEN,
+-		NON_STARTER,
+-		OPEN_PUNCTUATION,
+-		CLOSE_PUNCTUATION,
+-		QUOTATION,
+-		EXCLAMATION,
+-		IDEOGRAPHIC,
+-		NUMERIC,
+-		INFIX_SEPARATOR,
+-		SYMBOL,
+-		ALPHABETIC,
+-		PREFIX,
+-		POSTFIX,
+-		COMPLEX_CONTEXT,
+-		AMBIGUOUS,
+-		UNKNOWN,
+-		NEXT_LINE,
+-		WORD_JOINER,
+-		HANGUL_L_JAMO,
+-		HANGUL_V_JAMO,
+-		HANGUL_T_JAMO,
+-		HANGUL_LV_SYLLABLE,
+-		HANGUL_LVT_SYLLABLE,
+-		CLOSE_PARANTHESIS,
+-		CONDITIONAL_JAPANESE_STARTER,
+-		HEBREW_LETTER,
+-		REGIONAL_INDICATOR,
+-		EMOJI_BASE,
+-		EMOJI_MODIFIER,
+-		ZERO_WIDTH_JOINER
+-	}
+-
+-	[CCode (cname = "GNormalizeMode", cprefix = "G_NORMALIZE_", has_type_id = false)]
+-	public enum NormalizeMode {
+-		DEFAULT,
+-		NFD,
+-		DEFAULT_COMPOSE,
+-		NFC,
+-		ALL,
+-		NFKD,
+-		ALL_COMPOSE,
+-		NFKC
+-	}
+-}
+diff --git a/vapi/gtksourceview-3.0.deps b/vapi/gtksourceview-3.0.deps
+deleted file mode 100644
+index 1306ac49..00000000
+--- vapi/gtksourceview-3.0.deps
++++ /dev/null
+@@ -1,7 +0,0 @@
+-atk
+-gdk-3.0
+-gdk-pixbuf-2.0
+-gio-2.0
+-gtk+-3.0
+-pango
+-cairo
+diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi
+deleted file mode 100644
+index f1b8f66e..00000000
+--- vapi/gtksourceview-3.0.vapi
++++ /dev/null
+@@ -1,937 +0,0 @@
+-/* gtksourceview-3.0.vapi generated by vapigen-0.28, do not modify. */
+-
+-[CCode (cprefix = "Gtk", gir_namespace = "GtkSource", gir_version = "3.0", lower_case_cprefix = "gtk_")]
+-namespace Gtk {
+-	namespace SourceUtils {
+-		[CCode (cheader_filename = "gtksourceview/gtksource.h")]
+-		public static string escape_search_text (string text);
+-		[CCode (cheader_filename = "gtksourceview/gtksource.h")]
+-		public static string unescape_search_text (string text);
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_buffer_get_type ()")]
+-	[GIR (name = "Buffer")]
+-	public class SourceBuffer : Gtk.TextBuffer {
+-		[CCode (has_construct_function = false)]
+-		public SourceBuffer (Gtk.TextTagTable? table);
+-		public bool backward_iter_to_source_mark (ref Gtk.TextIter iter, string? category);
+-		public void begin_not_undoable_action ();
+-		public void change_case (Gtk.SourceChangeCaseType case_type, Gtk.TextIter start, Gtk.TextIter end);
+-		public unowned Gtk.SourceMark create_source_mark (string? name, string category, Gtk.TextIter where);
+-		public void end_not_undoable_action ();
+-		public void ensure_highlight (Gtk.TextIter start, Gtk.TextIter end);
+-		public bool forward_iter_to_source_mark (ref Gtk.TextIter iter, string? category);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] get_context_classes_at_iter (Gtk.TextIter iter);
+-		public bool get_highlight_matching_brackets ();
+-		public bool get_highlight_syntax ();
+-		public bool get_implicit_trailing_newline ();
+-		public unowned Gtk.SourceLanguage? get_language ();
+-		public int get_max_undo_levels ();
+-		public GLib.SList<weak Gtk.SourceMark> get_source_marks_at_iter (Gtk.TextIter iter, string? category);
+-		public GLib.SList<weak Gtk.SourceMark> get_source_marks_at_line (int line, string? category);
+-		public unowned Gtk.SourceStyleScheme? get_style_scheme ();
+-		public unowned Gtk.SourceUndoManager? get_undo_manager ();
+-		public bool iter_backward_to_context_class_toggle (ref Gtk.TextIter iter, string context_class);
+-		public bool iter_forward_to_context_class_toggle (ref Gtk.TextIter iter, string context_class);
+-		public bool iter_has_context_class (Gtk.TextIter iter, string context_class);
+-		public void join_lines (Gtk.TextIter start, Gtk.TextIter end);
+-		public void remove_source_marks (Gtk.TextIter start, Gtk.TextIter end, string? category);
+-		public void set_highlight_matching_brackets (bool highlight);
+-		public void set_highlight_syntax (bool highlight);
+-		public void set_implicit_trailing_newline (bool implicit_trailing_newline);
+-		public void set_language (Gtk.SourceLanguage? language);
+-		public void set_max_undo_levels (int max_undo_levels);
+-		public void set_style_scheme (Gtk.SourceStyleScheme? scheme);
+-		public void set_undo_manager (Gtk.SourceUndoManager? manager);
+-		public void sort_lines (Gtk.TextIter start, Gtk.TextIter end, Gtk.SourceSortFlags flags, int column);
+-		[CCode (has_construct_function = false)]
+-		public SourceBuffer.with_language (Gtk.SourceLanguage language);
+-		[NoAccessorMethod]
+-		public bool can_redo { get; }
+-		[NoAccessorMethod]
+-		public bool can_undo { get; }
+-		public bool highlight_matching_brackets { get; set; }
+-		public bool highlight_syntax { get; set; }
+-		public bool implicit_trailing_newline { get; set construct; }
+-		public Gtk.SourceLanguage language { get; set; }
+-		public int max_undo_levels { get; set; }
+-		public Gtk.SourceStyleScheme style_scheme { get; set; }
+-		public Gtk.SourceUndoManager undo_manager { get; set construct; }
+-		public virtual signal void bracket_matched (Gtk.TextIter iter, Gtk.SourceBracketMatchType state);
+-		public signal void highlight_updated (Gtk.TextIter start, Gtk.TextIter end);
+-		[HasEmitter]
+-		public virtual signal void redo ();
+-		public signal void source_mark_updated (Gtk.TextMark mark);
+-		[HasEmitter]
+-		public virtual signal void undo ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_get_type ()")]
+-	[GIR (name = "Completion")]
+-	public class SourceCompletion : GLib.Object, Gtk.Buildable {
+-		[CCode (has_construct_function = false)]
+-		protected SourceCompletion ();
+-		public bool add_provider (Gtk.SourceCompletionProvider provider) throws GLib.Error;
+-		public void block_interactive ();
+-		public unowned Gtk.SourceCompletionContext create_context (Gtk.TextIter? position);
+-		public unowned Gtk.SourceCompletionInfo get_info_window ();
+-		public unowned GLib.List<Gtk.SourceCompletionProvider> get_providers ();
+-		public unowned Gtk.SourceView? get_view ();
+-		[Version (deprecated = true, deprecated_since = "3.8")]
+-		public void move_window (Gtk.TextIter iter);
+-		[NoWrapper]
+-		public virtual bool proposal_activated (Gtk.SourceCompletionProvider provider, Gtk.SourceCompletionProposal proposal);
+-		public bool remove_provider (Gtk.SourceCompletionProvider provider) throws GLib.Error;
+-		[CCode (cname = "gtk_source_completion_show")]
+-		public bool start (GLib.List<Gtk.SourceCompletionProvider>? providers, Gtk.SourceCompletionContext context);
+-		public void unblock_interactive ();
+-		[NoAccessorMethod]
+-		public uint accelerators { get; set construct; }
+-		[NoAccessorMethod]
+-		public uint auto_complete_delay { get; set construct; }
+-		[NoAccessorMethod]
+-		public uint proposal_page_size { get; set construct; }
+-		[NoAccessorMethod]
+-		public uint provider_page_size { get; set construct; }
+-		[NoAccessorMethod]
+-		public bool remember_info_visibility { get; set construct; }
+-		[NoAccessorMethod]
+-		public bool select_on_show { get; set construct; }
+-		[NoAccessorMethod]
+-		public bool show_headers { get; set construct; }
+-		[NoAccessorMethod]
+-		public bool show_icons { get; set construct; }
+-		public Gtk.SourceView view { get; construct; }
+-		public virtual signal void activate_proposal ();
+-		[HasEmitter]
+-		public virtual signal void hide ();
+-		public virtual signal void move_cursor (Gtk.ScrollStep step, int num);
+-		public virtual signal void move_page (Gtk.ScrollStep step, int num);
+-		public virtual signal void populate_context (Gtk.SourceCompletionContext context);
+-		public virtual signal void show ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_context_get_type ()")]
+-	[GIR (name = "CompletionContext")]
+-	public class SourceCompletionContext : GLib.InitiallyUnowned {
+-		[CCode (has_construct_function = false)]
+-		protected SourceCompletionContext ();
+-		public void add_proposals (Gtk.SourceCompletionProvider provider, GLib.List<Gtk.SourceCompletionProposal>? proposals, bool finished);
+-		public Gtk.SourceCompletionActivation get_activation ();
+-		public bool get_iter (out Gtk.TextIter iter);
+-		[NoAccessorMethod]
+-		public Gtk.SourceCompletionActivation activation { get; set construct; }
+-		[NoAccessorMethod]
+-		public Gtk.SourceCompletion completion { owned get; construct; }
+-		[NoAccessorMethod]
+-		public Gtk.TextIter iter { get; set; }
+-		public virtual signal void cancelled ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_info_get_type ()")]
+-	[GIR (name = "CompletionInfo")]
+-	public class SourceCompletionInfo : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+-		[CCode (has_construct_function = false)]
+-		public SourceCompletionInfo ();
+-		[Version ( deprecated = true, deprecated_since = "3.8" )]
+-		public unowned Gtk.Widget get_widget ();
+-		public void move_to_iter (Gtk.TextView view, Gtk.TextIter? iter);
+-		[Version ( deprecated = true, deprecated_since = "3.8" )]
+-		public void set_widget (Gtk.Widget? widget);
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public virtual signal void before_show ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_item_get_type ()")]
+-	[GIR (name = "CompletionItem")]
+-	public class SourceCompletionItem : GLib.Object, Gtk.SourceCompletionProposal {
+-		[CCode (has_construct_function = false)]
+-		public SourceCompletionItem (string label, string text, Gdk.Pixbuf? icon, string? info);
+-		[CCode (has_construct_function = false)]
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public SourceCompletionItem.from_stock (string? label, string text, string stock, string? info);
+-		[CCode (has_construct_function = false)]
+-		public SourceCompletionItem.with_markup (string markup, string text, Gdk.Pixbuf? icon, string? info);
+-		[NoAccessorMethod]
+-		public GLib.Icon gicon { owned get; set; }
+-		[NoAccessorMethod]
+-		public Gdk.Pixbuf icon { owned get; set; }
+-		[NoAccessorMethod]
+-		public string icon_name { owned get; set; }
+-		[NoAccessorMethod]
+-		public string info { owned get; set; }
+-		[NoAccessorMethod]
+-		public string label { owned get; set; }
+-		[NoAccessorMethod]
+-		public string markup { owned get; set; }
+-		[NoAccessorMethod]
+-		public string text { owned get; set; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_words_get_type ()")]
+-	[GIR (name = "CompletionWords")]
+-	public class SourceCompletionWords : GLib.Object, Gtk.SourceCompletionProvider {
+-		[CCode (has_construct_function = false)]
+-		public SourceCompletionWords (string? name, Gdk.Pixbuf? icon);
+-		public void register (Gtk.TextBuffer buffer);
+-		public void unregister (Gtk.TextBuffer buffer);
+-		[NoAccessorMethod]
+-		public Gtk.SourceCompletionActivation activation { get; set construct; }
+-		[NoAccessorMethod]
+-		public Gdk.Pixbuf icon { owned get; set construct; }
+-		[NoAccessorMethod]
+-		public int interactive_delay { get; set construct; }
+-		[NoAccessorMethod]
+-		public uint minimum_word_size { get; set construct; }
+-		[NoAccessorMethod]
+-		public string name { owned get; set construct; }
+-		[NoAccessorMethod]
+-		public int priority { get; set construct; }
+-		[NoAccessorMethod]
+-		public uint proposals_batch_size { get; set construct; }
+-		[NoAccessorMethod]
+-		public uint scan_batch_size { get; set construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gtk_source_encoding_get_type ()")]
+-	[Compact]
+-	[GIR (name = "Encoding")]
+-	public class SourceEncoding {
+-		public Gtk.SourceEncoding copy ();
+-		[CCode (cname = "gtk_source_encoding_get_all")]
+-		public static GLib.SList<weak Gtk.SourceEncoding> et_all ();
+-		[CCode (cname = "gtk_source_encoding_get_current")]
+-		public static unowned Gtk.SourceEncoding et_current ();
+-		[CCode (cname = "gtk_source_encoding_get_default_candidates")]
+-		public static GLib.SList<weak Gtk.SourceEncoding> et_default_candidates ();
+-		[CCode (cname = "gtk_source_encoding_get_from_charset")]
+-		public static unowned Gtk.SourceEncoding? et_from_charset (string charset);
+-		[CCode (cname = "gtk_source_encoding_get_utf8")]
+-		public static unowned Gtk.SourceEncoding et_utf8 ();
+-		public void free ();
+-		public unowned string get_charset ();
+-		public unowned string get_name ();
+-		public string to_string ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_file_get_type ()")]
+-	[GIR (name = "File")]
+-	public class SourceFile : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceFile ();
+-		public void check_file_on_disk ();
+-		public Gtk.SourceCompressionType get_compression_type ();
+-		public unowned Gtk.SourceEncoding get_encoding ();
+-		public unowned GLib.File get_location ();
+-		public Gtk.SourceNewlineType get_newline_type ();
+-		public bool is_deleted ();
+-		public bool is_externally_modified ();
+-		public bool is_local ();
+-		public bool is_readonly ();
+-		public void set_location (GLib.File? location);
+-		public Gtk.SourceCompressionType compression_type { get; }
+-		public Gtk.SourceEncoding encoding { get; }
+-		public GLib.File location { get; set construct; }
+-		public Gtk.SourceNewlineType newline_type { get; }
+-		[NoAccessorMethod]
+-		public bool read_only { get; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_file_loader_get_type ()")]
+-	[GIR (name = "FileLoader")]
+-	public class SourceFileLoader : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceFileLoader (Gtk.SourceBuffer buffer, Gtk.SourceFile file);
+-		[CCode (has_construct_function = false)]
+-		public SourceFileLoader.from_stream (Gtk.SourceBuffer buffer, Gtk.SourceFile file, GLib.InputStream stream);
+-		public unowned Gtk.SourceBuffer get_buffer ();
+-		public Gtk.SourceCompressionType get_compression_type ();
+-		public unowned Gtk.SourceEncoding get_encoding ();
+-		public unowned Gtk.SourceFile get_file ();
+-		public unowned GLib.InputStream? get_input_stream ();
+-		public unowned GLib.File? get_location ();
+-		public Gtk.SourceNewlineType get_newline_type ();
+-		public async bool load_async (int io_priority, GLib.Cancellable? cancellable, owned GLib.FileProgressCallback? progress_callback) throws GLib.Error;
+-		public void set_candidate_encodings (GLib.SList<Gtk.SourceEncoding> candidate_encodings);
+-		public Gtk.SourceBuffer buffer { get; construct; }
+-		public Gtk.SourceFile file { get; construct; }
+-		public GLib.InputStream input_stream { get; construct; }
+-		public GLib.File location { get; construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_file_saver_get_type ()")]
+-	[GIR (name = "FileSaver")]
+-	public class SourceFileSaver : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceFileSaver (Gtk.SourceBuffer buffer, Gtk.SourceFile file);
+-		public unowned Gtk.SourceBuffer get_buffer ();
+-		public Gtk.SourceCompressionType get_compression_type ();
+-		public unowned Gtk.SourceEncoding get_encoding ();
+-		public unowned Gtk.SourceFile get_file ();
+-		public Gtk.SourceFileSaverFlags get_flags ();
+-		public unowned GLib.File get_location ();
+-		public Gtk.SourceNewlineType get_newline_type ();
+-		public async bool save_async (int io_priority, GLib.Cancellable? cancellable, owned GLib.FileProgressCallback? progress_callback) throws GLib.Error;
+-		public void set_compression_type (Gtk.SourceCompressionType compression_type);
+-		public void set_encoding (Gtk.SourceEncoding? encoding);
+-		public void set_flags (Gtk.SourceFileSaverFlags flags);
+-		public void set_newline_type (Gtk.SourceNewlineType newline_type);
+-		[CCode (has_construct_function = false)]
+-		public SourceFileSaver.with_target (Gtk.SourceBuffer buffer, Gtk.SourceFile file, GLib.File target_location);
+-		public Gtk.SourceBuffer buffer { get; construct; }
+-		public Gtk.SourceCompressionType compression_type { get; set construct; }
+-		public Gtk.SourceEncoding encoding { get; set construct; }
+-		public Gtk.SourceFile file { get; construct; }
+-		public Gtk.SourceFileSaverFlags flags { get; set construct; }
+-		public GLib.File location { get; construct; }
+-		public Gtk.SourceNewlineType newline_type { get; set construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_get_type ()")]
+-	[GIR (name = "Gutter")]
+-	public class SourceGutter : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		protected SourceGutter ();
+-		[Version ( deprecated = true, deprecated_since = "3.12" )]
+-		public void get_padding (int xpad, int ypad);
+-		public unowned Gtk.SourceGutterRenderer? get_renderer_at_pos (int x, int y);
+-		[Version ( deprecated = true, deprecated_since = "3.12" )]
+-		public unowned Gdk.Window get_window ();
+-		public bool insert (Gtk.SourceGutterRenderer renderer, int position);
+-		public void queue_draw ();
+-		public void remove (Gtk.SourceGutterRenderer renderer);
+-		public void reorder (Gtk.SourceGutterRenderer renderer, int position);
+-		[Version ( deprecated = true, deprecated_since = "3.12" )]
+-		public void set_padding (int xpad, int ypad);
+-		[NoAccessorMethod]
+-		public Gtk.SourceView view { owned get; construct; }
+-		[NoAccessorMethod]
+-		public Gtk.TextWindowType window_type { get; construct; }
+-		[Version ( deprecated = true, deprecated_since = "3.12" )]
+-		[NoAccessorMethod]
+-		public int xpad { get; set construct; }
+-		[Version ( deprecated = true, deprecated_since = "3.12" )]
+-		[NoAccessorMethod]
+-		public int ypad { get; set construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_renderer_get_type ()")]
+-	[GIR (name = "GutterRenderer")]
+-	public abstract class SourceGutterRenderer : GLib.InitiallyUnowned {
+-		[CCode (has_construct_function = false)]
+-		protected SourceGutterRenderer ();
+-		public virtual void begin (Cairo.Context cr, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.TextIter start, Gtk.TextIter end);
+-		[NoWrapper]
+-		public virtual void change_buffer (Gtk.TextBuffer old_buffer);
+-		[NoWrapper]
+-		public virtual void change_view (Gtk.TextView? old_view);
+-		public virtual void draw (Cairo.Context cr, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.TextIter start, Gtk.TextIter end, Gtk.SourceGutterRendererState state);
+-		public virtual void end ();
+-		public void get_alignment (out float xalign, out float yalign);
+-		public Gtk.SourceGutterRendererAlignmentMode get_alignment_mode ();
+-		public bool get_background (out Gdk.RGBA color);
+-		public void get_padding (out int xpad, out int ypad);
+-		public int get_size ();
+-		public unowned Gtk.TextView get_view ();
+-		public bool get_visible ();
+-		public Gtk.TextWindowType get_window_type ();
+-		public void set_alignment (float xalign, float yalign);
+-		public void set_alignment_mode (Gtk.SourceGutterRendererAlignmentMode mode);
+-		public void set_background (Gdk.RGBA? color);
+-		public void set_padding (int xpad, int ypad);
+-		public void set_size (int size);
+-		public void set_visible (bool visible);
+-		public Gtk.SourceGutterRendererAlignmentMode alignment_mode { get; set construct; }
+-		[NoAccessorMethod]
+-		public Gdk.RGBA background_rgba { get; set; }
+-		[NoAccessorMethod]
+-		public bool background_set { get; set construct; }
+-		public int size { get; set construct; }
+-		public Gtk.TextView view { get; }
+-		public bool visible { get; set construct; }
+-		public Gtk.TextWindowType window_type { get; }
+-		[NoAccessorMethod]
+-		public float xalign { get; set construct; }
+-		[NoAccessorMethod]
+-		public int xpad { get; set construct; }
+-		[NoAccessorMethod]
+-		public float yalign { get; set construct; }
+-		[NoAccessorMethod]
+-		public int ypad { get; set construct; }
+-		[HasEmitter]
+-		public virtual signal void activate (Gtk.TextIter iter, Cairo.RectangleInt area, Gdk.Event event);
+-		[HasEmitter]
+-		public virtual signal bool query_activatable (Gtk.TextIter iter, Cairo.RectangleInt area, Gdk.Event event);
+-		[HasEmitter]
+-		public virtual signal void query_data (Gtk.TextIter start, Gtk.TextIter end, Gtk.SourceGutterRendererState state);
+-		[HasEmitter]
+-		public virtual signal bool query_tooltip (Gtk.TextIter iter, Cairo.RectangleInt area, int x, int y, Gtk.Tooltip tooltip);
+-		[HasEmitter]
+-		public virtual signal void queue_draw ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_renderer_pixbuf_get_type ()")]
+-	[GIR (name = "GutterRendererPixbuf")]
+-	public class SourceGutterRendererPixbuf : Gtk.SourceGutterRenderer {
+-		[CCode (has_construct_function = false, type = "GtkSourceGutterRenderer*")]
+-		public SourceGutterRendererPixbuf ();
+-		public unowned GLib.Icon get_gicon ();
+-		public unowned string get_icon_name ();
+-		public unowned Gdk.Pixbuf get_pixbuf ();
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public unowned string get_stock_id ();
+-		public void set_gicon (GLib.Icon? icon);
+-		public void set_icon_name (string? icon_name);
+-		public void set_pixbuf (Gdk.Pixbuf? pixbuf);
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public void set_stock_id (string? stock_id);
+-		public GLib.Icon gicon { get; set; }
+-		public string icon_name { get; set; }
+-		public Gdk.Pixbuf pixbuf { get; set; }
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public string stock_id { get; set; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_renderer_text_get_type ()")]
+-	[GIR (name = "GutterRendererText")]
+-	public class SourceGutterRendererText : Gtk.SourceGutterRenderer {
+-		[CCode (has_construct_function = false, type = "GtkSourceGutterRenderer*")]
+-		public SourceGutterRendererText ();
+-		public void measure (string text, out int width, out int height);
+-		public void measure_markup (string markup, out int width, out int height);
+-		public void set_markup (string markup, int length);
+-		public void set_text (string text, int length);
+-		[NoAccessorMethod]
+-		public string markup { owned get; set construct; }
+-		[NoAccessorMethod]
+-		public string text { owned get; set construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_language_get_type ()")]
+-	[GIR (name = "Language")]
+-	public class SourceLanguage : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		protected SourceLanguage ();
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[]? get_globs ();
+-		public bool get_hidden ();
+-		public unowned string get_id ();
+-		public unowned string? get_metadata (string name);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[]? get_mime_types ();
+-		public unowned string get_name ();
+-		public unowned string get_section ();
+-		public unowned string? get_style_fallback (string style_id);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[]? get_style_ids ();
+-		public unowned string? get_style_name (string style_id);
+-		public bool hidden { get; }
+-		public string id { get; }
+-		public string name { get; }
+-		public string section { get; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_language_manager_get_type ()")]
+-	[GIR (name = "LanguageManager")]
+-	public class SourceLanguageManager : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceLanguageManager ();
+-		public static unowned Gtk.SourceLanguageManager get_default ();
+-		public unowned Gtk.SourceLanguage? get_language (string id);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public unowned string[]? get_language_ids ();
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public unowned string[] get_search_path ();
+-		public unowned Gtk.SourceLanguage? guess_language (string? filename, string? content_type);
+-		public void set_search_path ([CCode (array_length = false, array_null_terminated = true)] string[]? dirs);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] language_ids { get; }
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] search_path { get; set; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_map_get_type ()")]
+-	[GIR (name = "Map")]
+-	public class SourceMap : Gtk.SourceView, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
+-		[CCode (has_construct_function = false, type = "GtkWidget*")]
+-		public SourceMap ();
+-		public unowned Gtk.SourceView? get_view ();
+-		public void set_view (Gtk.SourceView view);
+-		[NoAccessorMethod]
+-		public Pango.FontDescription font_desc { owned get; set; }
+-		public Gtk.SourceView view { get; set; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_mark_get_type ()")]
+-	[GIR (name = "Mark")]
+-	public class SourceMark : Gtk.TextMark {
+-		[CCode (has_construct_function = false)]
+-		public SourceMark (string name, string category);
+-		public unowned string get_category ();
+-		public unowned Gtk.SourceMark? next (string? category);
+-		public unowned Gtk.SourceMark? prev (string category);
+-		public string category { get; construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_mark_attributes_get_type ()")]
+-	[GIR (name = "MarkAttributes")]
+-	public class SourceMarkAttributes : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceMarkAttributes ();
+-		public bool get_background (out Gdk.RGBA background);
+-		public unowned GLib.Icon get_gicon ();
+-		public unowned string get_icon_name ();
+-		public unowned Gdk.Pixbuf get_pixbuf ();
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public unowned string get_stock_id ();
+-		public string get_tooltip_markup (Gtk.SourceMark mark);
+-		public string get_tooltip_text (Gtk.SourceMark mark);
+-		public unowned Gdk.Pixbuf render_icon (Gtk.Widget widget, int size);
+-		public void set_background (Gdk.RGBA background);
+-		public void set_gicon (GLib.Icon gicon);
+-		public void set_icon_name (string icon_name);
+-		public void set_pixbuf (Gdk.Pixbuf pixbuf);
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public void set_stock_id (string stock_id);
+-		[NoAccessorMethod]
+-		public Gdk.RGBA background { get; set; }
+-		public GLib.Icon gicon { get; set; }
+-		public string icon_name { get; set; }
+-		public Gdk.Pixbuf pixbuf { get; set; }
+-		[Version ( deprecated = true, deprecated_since = "3.10" )]
+-		public string stock_id { get; set; }
+-		public signal string query_tooltip_markup (Gtk.SourceMark mark);
+-		public signal string query_tooltip_text (Gtk.SourceMark mark);
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_print_compositor_get_type ()")]
+-	[GIR (name = "PrintCompositor")]
+-	public class SourcePrintCompositor : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourcePrintCompositor (Gtk.SourceBuffer buffer);
+-		public void draw_page (Gtk.PrintContext context, int page_nr);
+-		[CCode (has_construct_function = false)]
+-		public SourcePrintCompositor.from_view (Gtk.SourceView view);
+-		public string get_body_font_name ();
+-		public double get_bottom_margin (Gtk.Unit unit);
+-		public unowned Gtk.SourceBuffer get_buffer ();
+-		public string get_footer_font_name ();
+-		public string get_header_font_name ();
+-		public bool get_highlight_syntax ();
+-		public double get_left_margin (Gtk.Unit unit);
+-		public string get_line_numbers_font_name ();
+-		public int get_n_pages ();
+-		public double get_pagination_progress ();
+-		public bool get_print_footer ();
+-		public bool get_print_header ();
+-		public uint get_print_line_numbers ();
+-		public double get_right_margin (Gtk.Unit unit);
+-		public uint get_tab_width ();
+-		public double get_top_margin (Gtk.Unit unit);
+-		public Gtk.WrapMode get_wrap_mode ();
+-		public bool paginate (Gtk.PrintContext context);
+-		public void set_body_font_name (string font_name);
+-		public void set_bottom_margin (double margin, Gtk.Unit unit);
+-		public void set_footer_font_name (string? font_name);
+-		public void set_footer_format (bool separator, string? left, string? center, string? right);
+-		public void set_header_font_name (string? font_name);
+-		public void set_header_format (bool separator, string? left, string? center, string? right);
+-		public void set_highlight_syntax (bool highlight);
+-		public void set_left_margin (double margin, Gtk.Unit unit);
+-		public void set_line_numbers_font_name (string? font_name);
+-		public void set_print_footer (bool print);
+-		public void set_print_header (bool print);
+-		public void set_print_line_numbers (uint interval);
+-		public void set_right_margin (double margin, Gtk.Unit unit);
+-		public void set_tab_width (uint width);
+-		public void set_top_margin (double margin, Gtk.Unit unit);
+-		public void set_wrap_mode (Gtk.WrapMode wrap_mode);
+-		public string body_font_name { owned get; set; }
+-		public Gtk.SourceBuffer buffer { get; construct; }
+-		public string footer_font_name { owned get; set; }
+-		public string header_font_name { owned get; set; }
+-		public bool highlight_syntax { get; set; }
+-		public string line_numbers_font_name { owned get; set; }
+-		public int n_pages { get; }
+-		public bool print_footer { get; set; }
+-		public bool print_header { get; set; }
+-		public uint print_line_numbers { get; set; }
+-		public uint tab_width { get; set; }
+-		public Gtk.WrapMode wrap_mode { get; set; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_search_context_get_type ()")]
+-	[GIR (name = "SearchContext")]
+-	public class SourceSearchContext : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceSearchContext (Gtk.SourceBuffer buffer, Gtk.SourceSearchSettings? settings);
+-		public bool backward (Gtk.TextIter iter, out Gtk.TextIter match_start, out Gtk.TextIter match_end);
+-		public async bool backward_async (Gtk.TextIter iter, GLib.Cancellable? cancellable, out Gtk.TextIter match_start, out Gtk.TextIter match_end) throws GLib.Error;
+-		public bool forward (Gtk.TextIter iter, out Gtk.TextIter match_start, out Gtk.TextIter match_end);
+-		public async bool forward_async (Gtk.TextIter iter, GLib.Cancellable? cancellable, out Gtk.TextIter match_start, out Gtk.TextIter match_end) throws GLib.Error;
+-		public unowned Gtk.SourceBuffer get_buffer ();
+-		public bool get_highlight ();
+-		public unowned Gtk.SourceStyle get_match_style ();
+-		public int get_occurrence_position (Gtk.TextIter match_start, Gtk.TextIter match_end);
+-		public int get_occurrences_count ();
+-		public GLib.Error? get_regex_error ();
+-		public unowned Gtk.SourceSearchSettings get_settings ();
+-		public bool replace (Gtk.TextIter match_start, Gtk.TextIter match_end, string replace, int replace_length) throws GLib.Error;
+-		public uint replace_all (string replace, int replace_length) throws GLib.Error;
+-		public void set_highlight (bool highlight);
+-		public void set_match_style (Gtk.SourceStyle? match_style);
+-		public void set_settings (Gtk.SourceSearchSettings? settings);
+-		public Gtk.SourceBuffer buffer { get; construct; }
+-		public bool highlight { get; set construct; }
+-		public Gtk.SourceStyle match_style { get; set construct; }
+-		public int occurrences_count { get; }
+-		public GLib.Error? regex_error { owned get; }
+-		public Gtk.SourceSearchSettings settings { get; set construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_search_settings_get_type ()")]
+-	[GIR (name = "SearchSettings")]
+-	public class SourceSearchSettings : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceSearchSettings ();
+-		public bool get_at_word_boundaries ();
+-		public bool get_case_sensitive ();
+-		public bool get_regex_enabled ();
+-		public unowned string? get_search_text ();
+-		public bool get_wrap_around ();
+-		public void set_at_word_boundaries (bool at_word_boundaries);
+-		public void set_case_sensitive (bool case_sensitive);
+-		public void set_regex_enabled (bool regex_enabled);
+-		public void set_search_text (string? search_text);
+-		public void set_wrap_around (bool wrap_around);
+-		public bool at_word_boundaries { get; set construct; }
+-		public bool case_sensitive { get; set construct; }
+-		public bool regex_enabled { get; set construct; }
+-		public string search_text { get; set construct; }
+-		public bool wrap_around { get; set construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_get_type ()")]
+-	[GIR (name = "Style")]
+-	public class SourceStyle : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		protected SourceStyle ();
+-		public Gtk.SourceStyle copy ();
+-		[NoAccessorMethod]
+-		public string background { owned get; construct; }
+-		[NoAccessorMethod]
+-		public bool background_set { get; construct; }
+-		[NoAccessorMethod]
+-		public bool bold { get; construct; }
+-		[NoAccessorMethod]
+-		public bool bold_set { get; construct; }
+-		[NoAccessorMethod]
+-		public string foreground { owned get; construct; }
+-		[NoAccessorMethod]
+-		public bool foreground_set { get; construct; }
+-		[NoAccessorMethod]
+-		public bool italic { get; construct; }
+-		[NoAccessorMethod]
+-		public bool italic_set { get; construct; }
+-		[NoAccessorMethod]
+-		public string line_background { owned get; construct; }
+-		[NoAccessorMethod]
+-		public bool line_background_set { get; construct; }
+-		[NoAccessorMethod]
+-		public Pango.Underline pango_underline { get; construct; }
+-		[NoAccessorMethod]
+-		public string scale { owned get; construct; }
+-		[NoAccessorMethod]
+-		public bool scale_set { get; construct; }
+-		[NoAccessorMethod]
+-		public bool strikethrough { get; construct; }
+-		[NoAccessorMethod]
+-		public bool strikethrough_set { get; construct; }
+-		[Version ( deprecated = true, deprecated_since = "3.18" )]
+-		[NoAccessorMethod]
+-		public bool underline { get; construct; }
+-		[NoAccessorMethod]
+-		public string underline_color { owned get; construct; }
+-		[NoAccessorMethod]
+-		public bool underline_color_set { get; construct; }
+-		[NoAccessorMethod]
+-		public bool underline_set { get; construct; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_get_type ()")]
+-	[GIR (name = "StyleScheme")]
+-	public class SourceStyleScheme : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		protected SourceStyleScheme ();
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public unowned string[]? get_authors ();
+-		public unowned string? get_description ();
+-		public unowned string? get_filename ();
+-		public unowned string get_id ();
+-		public unowned string get_name ();
+-		public unowned Gtk.SourceStyle? get_style (string style_id);
+-		public string description { get; }
+-		public string filename { get; }
+-		public string id { get; construct; }
+-		public string name { get; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_chooser_button_get_type ()")]
+-	[GIR (name = "StyleSchemeChooserButton")]
+-	public class SourceStyleSchemeChooserButton : Gtk.Button, Atk.Implementor, Gtk.Actionable, Gtk.Activatable, Gtk.Buildable, Gtk.SourceStyleSchemeChooser {
+-		[CCode (has_construct_function = false, type = "GtkWidget*")]
+-		public SourceStyleSchemeChooserButton ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_chooser_widget_get_type ()")]
+-	[GIR (name = "StyleSchemeChooserWidget")]
+-	public class SourceStyleSchemeChooserWidget : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.SourceStyleSchemeChooser {
+-		[CCode (has_construct_function = false, type = "GtkWidget*")]
+-		public SourceStyleSchemeChooserWidget ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_manager_get_type ()")]
+-	[GIR (name = "StyleSchemeManager")]
+-	public class SourceStyleSchemeManager : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public SourceStyleSchemeManager ();
+-		public void append_search_path (string path);
+-		public void force_rescan ();
+-		public static unowned Gtk.SourceStyleSchemeManager get_default ();
+-		public unowned Gtk.SourceStyleScheme get_scheme (string scheme_id);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public unowned string[]? get_scheme_ids ();
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public unowned string[] get_search_path ();
+-		public void prepend_search_path (string path);
+-		public void set_search_path ([CCode (array_length = false, array_null_terminated = true)] string[]? path);
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] scheme_ids { get; }
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		public string[] search_path { get; set; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_view_get_type ()")]
+-	[GIR (name = "View")]
+-	public class SourceView : Gtk.TextView, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
+-		[CCode (has_construct_function = false, type = "GtkWidget*")]
+-		public SourceView ();
+-		public bool get_auto_indent ();
+-		public Gtk.SourceBackgroundPatternType get_background_pattern ();
+-		public unowned Gtk.SourceCompletion get_completion ();
+-		public Gtk.SourceDrawSpacesFlags get_draw_spaces ();
+-		public unowned Gtk.SourceGutter get_gutter (Gtk.TextWindowType window_type);
+-		public bool get_highlight_current_line ();
+-		public bool get_indent_on_tab ();
+-		public int get_indent_width ();
+-		public bool get_insert_spaces_instead_of_tabs ();
+-		public unowned Gtk.SourceMarkAttributes get_mark_attributes (string category, int priority);
+-		public uint get_right_margin_position ();
+-		public bool get_show_line_marks ();
+-		public bool get_show_line_numbers ();
+-		public bool get_show_right_margin ();
+-		public bool get_smart_backspace ();
+-		public Gtk.SourceSmartHomeEndType get_smart_home_end ();
+-		public uint get_tab_width ();
+-		public uint get_visual_column (Gtk.TextIter iter);
+-		public void indent_lines (Gtk.TextIter start, Gtk.TextIter end);
+-		public void set_auto_indent (bool enable);
+-		public void set_background_pattern (Gtk.SourceBackgroundPatternType background_pattern);
+-		public void set_draw_spaces (Gtk.SourceDrawSpacesFlags flags);
+-		public void set_highlight_current_line (bool highlight);
+-		public void set_indent_on_tab (bool enable);
+-		public void set_indent_width (int width);
+-		public void set_insert_spaces_instead_of_tabs (bool enable);
+-		public void set_mark_attributes (string category, Gtk.SourceMarkAttributes attributes, int priority);
+-		public void set_right_margin_position (uint pos);
+-		public void set_show_line_marks (bool show);
+-		public void set_show_line_numbers (bool show);
+-		public void set_show_right_margin (bool show);
+-		public void set_smart_backspace (bool smart_backspace);
+-		public void set_smart_home_end (Gtk.SourceSmartHomeEndType smart_home_end);
+-		public void set_tab_width (uint width);
+-		public void unindent_lines (Gtk.TextIter start, Gtk.TextIter end);
+-		[CCode (has_construct_function = false, type = "GtkWidget*")]
+-		public SourceView.with_buffer (Gtk.SourceBuffer buffer);
+-		public bool auto_indent { get; set; }
+-		public Gtk.SourceBackgroundPatternType background_pattern { get; set; }
+-		public Gtk.SourceCompletion completion { get; }
+-		public Gtk.SourceDrawSpacesFlags draw_spaces { get; set; }
+-		public bool highlight_current_line { get; set; }
+-		public bool indent_on_tab { get; set; }
+-		public int indent_width { get; set; }
+-		public bool insert_spaces_instead_of_tabs { get; set; }
+-		public uint right_margin_position { get; set; }
+-		public bool show_line_marks { get; set; }
+-		public bool show_line_numbers { get; set; }
+-		public bool show_right_margin { get; set; }
+-		public bool smart_backspace { get; set; }
+-		public Gtk.SourceSmartHomeEndType smart_home_end { get; set; }
+-		public uint tab_width { get; set; }
+-		public signal void change_case (Gtk.SourceChangeCaseType case_type);
+-		public signal void change_number (int count);
+-		public signal void join_lines ();
+-		public virtual signal void line_mark_activated (Gtk.TextIter iter, Gdk.Event event);
+-		public virtual signal void move_lines (bool copy, int step);
+-		public signal void move_to_matching_bracket (bool extend_selection);
+-		public virtual signal void move_words (int step);
+-		public virtual signal void redo ();
+-		public virtual signal void show_completion ();
+-		public virtual signal void undo ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_proposal_get_type ()")]
+-	[GIR (name = "CompletionProposal")]
+-	public interface SourceCompletionProposal : GLib.Object {
+-		public virtual bool equal (Gtk.SourceCompletionProposal other);
+-		public abstract unowned GLib.Icon? get_gicon ();
+-		public virtual unowned Gdk.Pixbuf? get_icon ();
+-		public abstract unowned string? get_icon_name ();
+-		public abstract string? get_info ();
+-		public abstract string get_label ();
+-		public abstract string get_markup ();
+-		public abstract string get_text ();
+-		public virtual uint hash ();
+-		[HasEmitter]
+-		public virtual signal void changed ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_provider_get_type ()")]
+-	[GIR (name = "CompletionProvider")]
+-	public interface SourceCompletionProvider : GLib.Object {
+-		public virtual bool activate_proposal (Gtk.SourceCompletionProposal proposal, Gtk.TextIter iter);
+-		public virtual Gtk.SourceCompletionActivation get_activation ();
+-		public virtual unowned GLib.Icon? get_gicon ();
+-		public virtual unowned Gdk.Pixbuf? get_icon ();
+-		public virtual unowned string? get_icon_name ();
+-		public virtual unowned Gtk.Widget? get_info_widget (Gtk.SourceCompletionProposal proposal);
+-		public virtual int get_interactive_delay ();
+-		public virtual string get_name ();
+-		public virtual int get_priority ();
+-		public virtual bool get_start_iter (Gtk.SourceCompletionContext context, Gtk.SourceCompletionProposal proposal, out Gtk.TextIter iter);
+-		public virtual bool match (Gtk.SourceCompletionContext context);
+-		public virtual void populate (Gtk.SourceCompletionContext context);
+-		public virtual void update_info (Gtk.SourceCompletionProposal proposal, Gtk.SourceCompletionInfo info);
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_chooser_get_type ()")]
+-	[GIR (name = "StyleSchemeChooser")]
+-	public interface SourceStyleSchemeChooser : GLib.Object {
+-		public abstract unowned Gtk.SourceStyleScheme get_style_scheme ();
+-		public abstract void set_style_scheme (Gtk.SourceStyleScheme scheme);
+-		public abstract Gtk.SourceStyleScheme style_scheme { get; set; }
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_undo_manager_get_type ()")]
+-	[GIR (name = "UndoManager")]
+-	public interface SourceUndoManager : GLib.Object {
+-		public abstract void begin_not_undoable_action ();
+-		public abstract bool can_redo ();
+-		public abstract bool can_undo ();
+-		public abstract void end_not_undoable_action ();
+-		public abstract void redo ();
+-		public abstract void undo ();
+-		[HasEmitter]
+-		public virtual signal void can_redo_changed ();
+-		[HasEmitter]
+-		public virtual signal void can_undo_changed ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_BACKGROUND_PATTERN_TYPE_", type_id = "gtk_source_background_pattern_type_get_type ()")]
+-	[GIR (name = "BackgroundPatternType")]
+-	public enum SourceBackgroundPatternType {
+-		NONE,
+-		GRID
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_BRACKET_MATCH_", type_id = "gtk_source_bracket_match_type_get_type ()")]
+-	[GIR (name = "BracketMatchType")]
+-	public enum SourceBracketMatchType {
+-		NONE,
+-		OUT_OF_RANGE,
+-		NOT_FOUND,
+-		FOUND
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_CHANGE_CASE_", type_id = "gtk_source_change_case_type_get_type ()")]
+-	[GIR (name = "ChangeCaseType")]
+-	public enum SourceChangeCaseType {
+-		LOWER,
+-		UPPER,
+-		TOGGLE,
+-		TITLE
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_", type_id = "gtk_source_completion_activation_get_type ()")]
+-	[Flags]
+-	[GIR (name = "CompletionActivation")]
+-	public enum SourceCompletionActivation {
+-		NONE,
+-		INTERACTIVE,
+-		USER_REQUESTED
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_COMPRESSION_TYPE_", type_id = "gtk_source_compression_type_get_type ()")]
+-	[GIR (name = "CompressionType")]
+-	public enum SourceCompressionType {
+-		NONE,
+-		GZIP
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_DRAW_SPACES_", type_id = "gtk_source_draw_spaces_flags_get_type ()")]
+-	[Flags]
+-	[GIR (name = "DrawSpacesFlags")]
+-	public enum SourceDrawSpacesFlags {
+-		SPACE,
+-		TAB,
+-		NEWLINE,
+-		NBSP,
+-		LEADING,
+-		TEXT,
+-		TRAILING,
+-		ALL
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_FILE_SAVER_FLAGS_", type_id = "gtk_source_file_saver_flags_get_type ()")]
+-	[Flags]
+-	[GIR (name = "FileSaverFlags")]
+-	public enum SourceFileSaverFlags {
+-		NONE,
+-		IGNORE_INVALID_CHARS,
+-		IGNORE_MODIFICATION_TIME,
+-		CREATE_BACKUP
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_", type_id = "gtk_source_gutter_renderer_alignment_mode_get_type ()")]
+-	[GIR (name = "GutterRendererAlignmentMode")]
+-	public enum SourceGutterRendererAlignmentMode {
+-		CELL,
+-		FIRST,
+-		LAST
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_STATE_", type_id = "gtk_source_gutter_renderer_state_get_type ()")]
+-	[Flags]
+-	[GIR (name = "GutterRendererState")]
+-	public enum SourceGutterRendererState {
+-		NORMAL,
+-		CURSOR,
+-		PRELIT,
+-		SELECTED
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_NEWLINE_TYPE_", type_id = "gtk_source_newline_type_get_type ()")]
+-	[GIR (name = "NewlineType")]
+-	public enum SourceNewlineType {
+-		LF,
+-		CR,
+-		CR_LF
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_SMART_HOME_END_", type_id = "gtk_source_smart_home_end_type_get_type ()")]
+-	[GIR (name = "SmartHomeEndType")]
+-	public enum SourceSmartHomeEndType {
+-		DISABLED,
+-		BEFORE,
+-		AFTER,
+-		ALWAYS
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_SORT_FLAGS_", type_id = "gtk_source_sort_flags_get_type ()")]
+-	[Flags]
+-	[GIR (name = "SortFlags")]
+-	public enum SourceSortFlags {
+-		NONE,
+-		CASE_SENSITIVE,
+-		REVERSE_ORDER,
+-		REMOVE_DUPLICATES
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_", type_id = "gtk_source_view_gutter_position_get_type ()")]
+-	[GIR (name = "ViewGutterPosition")]
+-	public enum SourceViewGutterPosition {
+-		LINES,
+-		MARKS
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_COMPLETION_ERROR_")]
+-	[GIR (name = "CompletionError")]
+-	public errordomain SourceCompletionError {
+-		ALREADY_BOUND,
+-		NOT_BOUND;
+-		[CCode (cname = "gtk_source_completion_error_quark")]
+-		public static GLib.Quark uark ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_FILE_LOADER_ERROR_")]
+-	[GIR (name = "FileLoaderError")]
+-	public errordomain SourceFileLoaderError {
+-		TOO_BIG,
+-		ENCODING_AUTO_DETECTION_FAILED,
+-		CONVERSION_FALLBACK;
+-		[CCode (cname = "gtk_source_file_loader_error_quark")]
+-		public static GLib.Quark uark ();
+-	}
+-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_FILE_SAVER_ERROR_")]
+-	[GIR (name = "FileSaverError")]
+-	public errordomain SourceFileSaverError {
+-		INVALID_CHARS,
+-		EXTERNALLY_MODIFIED;
+-		[CCode (cname = "gtk_source_file_saver_error_quark")]
+-		public static GLib.Quark uark ();
+-	}
+-}
+diff --git a/vapi/libsoup-2.4.deps b/vapi/libsoup-2.4.deps
+deleted file mode 100644
+index cd10dfde..00000000
+--- vapi/libsoup-2.4.deps
++++ /dev/null
+@@ -1 +0,0 @@
+-gio-2.0
+diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
+deleted file mode 100644
+index bcbe7d00..00000000
+--- vapi/libsoup-2.4.vapi
++++ /dev/null
+@@ -1,1396 +0,0 @@
+-/* libsoup-2.4.vapi generated by vapigen, do not modify. */
+-
+-[CCode (cprefix = "Soup", gir_namespace = "Soup", gir_version = "2.4", lower_case_cprefix = "soup_")]
+-namespace Soup {
+-	namespace Form {
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static GLib.HashTable<string,string> decode (string encoded_form);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static GLib.HashTable<string,string> decode_multipart (Soup.Message msg, string file_control_name, out string filename, out string content_type, out Soup.Buffer file);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static string encode (...);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static string encode_datalist (GLib.Datalist<string> form_data_set);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static string encode_hash (GLib.HashTable<string,string> form_data_set);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static string encode_valist (string first_field, va_list args);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static Soup.Message request_new (string method, string uri, ...);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static Soup.Message request_new_from_datalist (string method, string uri, GLib.Datalist<string> form_data_set);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static Soup.Message request_new_from_hash (string method, string uri, GLib.HashTable<string,string> form_data_set);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static Soup.Message request_new_from_multipart (string uri, Soup.Multipart multipart);
+-	}
+-	namespace XMLRPC {
+-		[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_ERROR_")]
+-		[GIR (name = "XMLRPCError")]
+-		public errordomain Error {
+-			ARGUMENTS,
+-			RETVAL
+-		}
+-		[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_FAULT_")]
+-		[GIR (name = "XMLRPCFault")]
+-		public errordomain Fault {
+-			PARSE_ERROR_NOT_WELL_FORMED,
+-			PARSE_ERROR_UNSUPPORTED_ENCODING,
+-			PARSE_ERROR_INVALID_CHARACTER_FOR_ENCODING,
+-			SERVER_ERROR_INVALID_XML_RPC,
+-			SERVER_ERROR_REQUESTED_METHOD_NOT_FOUND,
+-			SERVER_ERROR_INVALID_METHOD_PARAMETERS,
+-			SERVER_ERROR_INTERNAL_XML_RPC_ERROR,
+-			APPLICATION_ERROR,
+-			SYSTEM_ERROR,
+-			TRANSPORT_ERROR
+-		}
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		[PrintfFormat]
+-		public static string build_fault (int fault_code, string fault_format, ...);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static string build_method_call (string method_name, [CCode (array_length_cname = "n_params", array_length_pos = 2.1)] GLib.Value[] @params);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static string build_method_response (GLib.Value value);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static GLib.Quark error_quark ();
+-		[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-		public static bool extract_method_call (string method_call, int length, out string method_name, ...);
+-		[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-		public static bool extract_method_response (string method_response, int length, ...) throws Soup.XMLRPC.Fault;
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static GLib.Quark fault_quark ();
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static bool parse_method_call (string method_call, int length, out string method_name, out GLib.ValueArray @params);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		public static bool parse_method_response (string method_response, int length, out GLib.Value value) throws Soup.XMLRPC.Fault;
+-		[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-		public static Soup.Message request_new (string uri, string method_name, ...);
+-		[CCode (cheader_filename = "libsoup/soup.h")]
+-		[PrintfFormat]
+-		public static void set_fault (Soup.Message msg, int fault_code, string fault_format, ...);
+-		[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-		public static void set_response (Soup.Message msg, ...);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_address_get_type ()")]
+-	public class Address : GLib.Object, GLib.SocketConnectable {
+-		[CCode (has_construct_function = false)]
+-		public Address (string name, uint port);
+-		[CCode (has_construct_function = false)]
+-		public Address.any (Soup.AddressFamily family, uint port);
+-		public bool equal_by_ip ([CCode (type = "gconstpointer")] Soup.Address addr2);
+-		public bool equal_by_name ([CCode (type = "gconstpointer")] Soup.Address addr2);
+-		[CCode (has_construct_function = false)]
+-		public Address.from_sockaddr (void* sa, int len);
+-		public GLib.SocketAddress get_gsockaddr ();
+-		public unowned string get_name ();
+-		public unowned string get_physical ();
+-		public uint get_port ();
+-		public void* get_sockaddr (int len);
+-		public uint hash_by_ip ();
+-		public uint hash_by_name ();
+-		public bool is_resolved ();
+-		public void resolve_async (GLib.MainContext? async_context, GLib.Cancellable? cancellable, Soup.AddressCallback callback);
+-		public uint resolve_sync (GLib.Cancellable? cancellable);
+-		[NoAccessorMethod]
+-		public Soup.AddressFamily family { get; construct; }
+-		public string name { get; construct; }
+-		public string physical { get; }
+-		public int port { get; construct; }
+-		[NoAccessorMethod]
+-		public void* sockaddr { get; construct; }
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_get_type ()")]
+-	public abstract class Auth : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public Auth (GLib.Type type, Soup.Message msg, string auth_header);
+-		public virtual void authenticate (string username, string password);
+-		public virtual string get_authorization (Soup.Message msg);
+-		public unowned string get_host ();
+-		public string get_info ();
+-		public virtual GLib.SList<string> get_protection_space (Soup.URI source_uri);
+-		public unowned string get_realm ();
+-		public unowned string get_scheme_name ();
+-		public virtual bool update (Soup.Message msg, GLib.HashTable<void*,void*> auth_params);
+-		public string host { get; construct; }
+-		[NoAccessorMethod]
+-		public virtual bool is_authenticated { get; }
+-		[NoAccessorMethod]
+-		public bool is_for_proxy { get; construct; }
+-		public string realm { get; construct; }
+-		public string scheme_name { get; }
+-		public signal void save_password (string username, string password);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_basic_get_type ()")]
+-	public class AuthBasic : Soup.Auth {
+-		[CCode (has_construct_function = false)]
+-		protected AuthBasic ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_digest_get_type ()")]
+-	public class AuthDigest : Soup.Auth {
+-		[CCode (has_construct_function = false)]
+-		protected AuthDigest ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_domain_get_type ()")]
+-	public abstract class AuthDomain : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		protected AuthDomain ();
+-		[NoWrapper]
+-		public virtual string accepts (Soup.Message msg, string header);
+-		public void add_path (string path);
+-		[CCode (vfunc_name = "challenge")]
+-		public virtual string challenge (Soup.Message msg);
+-		public virtual bool check_password (Soup.Message msg, string username, string password);
+-		public bool covers (Soup.Message msg);
+-		public unowned string get_realm ();
+-		public void remove_path (string path);
+-		public void set_filter (owned Soup.AuthDomainFilter filter);
+-		public void set_generic_auth_callback (owned Soup.AuthDomainGenericAuthCallback auth_callback);
+-		public bool try_generic_auth_callback (Soup.Message msg, string username);
+-		[NoAccessorMethod]
+-		public void* filter { get; set; }
+-		[NoAccessorMethod]
+-		public void* filter_data { get; set; }
+-		[NoAccessorMethod]
+-		public void* generic_auth_callback { get; set; }
+-		[NoAccessorMethod]
+-		public void* generic_auth_data { get; set; }
+-		[NoAccessorMethod]
+-		public bool proxy { get; construct; }
+-		public string realm { get; construct; }
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_domain_basic_get_type ()")]
+-	public class AuthDomainBasic : Soup.AuthDomain {
+-		[CCode (has_construct_function = false, type = "SoupAuthDomain*")]
+-		public AuthDomainBasic (string optname1, ...);
+-		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainBasicAuthCallback callback);
+-		[NoAccessorMethod]
+-		public void* auth_callback { get; set; }
+-		[NoAccessorMethod]
+-		public void* auth_data { get; set; }
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_domain_digest_get_type ()")]
+-	public class AuthDomainDigest : Soup.AuthDomain {
+-		[CCode (has_construct_function = false, type = "SoupAuthDomain*")]
+-		public AuthDomainDigest (string optname1, ...);
+-		public static string encode_password (string username, string realm, string password);
+-		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainDigestAuthCallback callback);
+-		[NoAccessorMethod]
+-		public void* auth_callback { get; set; }
+-		[NoAccessorMethod]
+-		public void* auth_data { get; set; }
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_ntlm_get_type ()")]
+-	public class AuthNTLM : Soup.Auth {
+-		[CCode (has_construct_function = false)]
+-		protected AuthNTLM ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_buffer_get_type ()")]
+-	[Compact]
+-	public class Buffer {
+-		[CCode (array_length_cname = "length", array_length_type = "gsize")]
+-		public uint8[] data;
+-		public size_t length;
+-		[CCode (has_construct_function = false)]
+-		public Buffer (Soup.MemoryUse use, [CCode (array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize", type = "gconstpointer")] uint8[] data);
+-		public Soup.Buffer copy ();
+-		public void free ();
+-		public void get_data ([CCode (array_length_cname = "length", array_length_pos = 1.1, array_length_type = "gsize")] out unowned uint8[] data);
+-		public void* get_owner ();
+-		[CCode (has_construct_function = false)]
+-		public Buffer.subbuffer (Soup.Buffer parent, size_t offset, size_t length);
+-		[CCode (has_construct_function = false)]
+-		public Buffer.take ([CCode (array_length_cname = "length", array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data);
+-		[CCode (has_construct_function = false)]
+-		public Buffer.with_owner ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gsize", type = "gconstpointer")] uint8[] data, void* owner, GLib.DestroyNotify? owner_dnotify);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_byte_array_get_type ()")]
+-	[Compact]
+-	public class ByteArray {
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_client_context_get_type ()")]
+-	[Compact]
+-	public class ClientContext {
+-		public unowned Soup.Address get_address ();
+-		public unowned Soup.AuthDomain get_auth_domain ();
+-		public unowned string get_auth_user ();
+-		public unowned string get_host ();
+-		public unowned Soup.Socket get_socket ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Compact]
+-	public class Connection {
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_content_decoder_get_type ()")]
+-	public class ContentDecoder : GLib.Object, Soup.SessionFeature {
+-		[CCode (has_construct_function = false)]
+-		protected ContentDecoder ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_content_sniffer_get_type ()")]
+-	public class ContentSniffer : GLib.Object, Soup.SessionFeature {
+-		[CCode (has_construct_function = false)]
+-		public ContentSniffer ();
+-		[NoWrapper]
+-		public virtual size_t get_buffer_size ();
+-		public virtual string sniff (Soup.Message msg, Soup.Buffer buffer, out GLib.HashTable<string,string>? @params);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_cookie_get_type ()")]
+-	[Compact]
+-	public class Cookie {
+-		public weak string domain;
+-		public weak Soup.Date expires;
+-		public bool http_only;
+-		public weak string name;
+-		public weak string path;
+-		public bool secure;
+-		public weak string value;
+-		[CCode (has_construct_function = false)]
+-		public Cookie (string name, string value, string domain, string path, int max_age);
+-		public bool applies_to_uri (Soup.URI uri);
+-		public Soup.Cookie copy ();
+-		public bool domain_matches (string host);
+-		public bool equal (Soup.Cookie cookie2);
+-		public void free ();
+-		public unowned string get_domain ();
+-		public unowned Soup.Date get_expires ();
+-		public bool get_http_only ();
+-		public unowned string get_name ();
+-		public unowned string get_path ();
+-		public bool get_secure ();
+-		public unowned string get_value ();
+-		public static Soup.Cookie parse (string header, Soup.URI origin);
+-		public void set_domain (string domain);
+-		public void set_expires (Soup.Date expires);
+-		public void set_http_only (bool http_only);
+-		public void set_max_age (int max_age);
+-		public void set_name (string name);
+-		public void set_path (string path);
+-		public void set_secure (bool secure);
+-		public void set_value (string value);
+-		public string to_cookie_header ();
+-		public string to_set_cookie_header ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_cookie_jar_get_type ()")]
+-	public class CookieJar : GLib.Object, Soup.SessionFeature {
+-		[CCode (has_construct_function = false)]
+-		public CookieJar ();
+-		public void add_cookie (Soup.Cookie cookie);
+-		public GLib.SList<Soup.Cookie> all_cookies ();
+-		public void delete_cookie (Soup.Cookie cookie);
+-		public Soup.CookieJarAcceptPolicy get_accept_policy ();
+-		public string get_cookies (Soup.URI uri, bool for_http);
+-		public virtual void save ();
+-		public void set_accept_policy (Soup.CookieJarAcceptPolicy policy);
+-		public void set_cookie (Soup.URI uri, string cookie);
+-		public void set_cookie_with_first_party (Soup.URI uri, Soup.URI first_party, string cookie);
+-		public Soup.CookieJarAcceptPolicy accept_policy { get; set; }
+-		[NoAccessorMethod]
+-		public bool read_only { get; construct; }
+-		public virtual signal void changed (Soup.Cookie old_cookie, Soup.Cookie new_cookie);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_cookie_jar_text_get_type ()")]
+-	public class CookieJarText : Soup.CookieJar, Soup.SessionFeature {
+-		[CCode (has_construct_function = false, type = "SoupCookieJar*")]
+-		public CookieJarText (string filename, bool read_only);
+-		[NoAccessorMethod]
+-		public string filename { owned get; construct; }
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_date_get_type ()")]
+-	[Compact]
+-	public class Date {
+-		public int day;
+-		public int hour;
+-		public int minute;
+-		public int month;
+-		public int offset;
+-		public int second;
+-		public bool utc;
+-		public int year;
+-		[CCode (has_construct_function = false)]
+-		public Date (int year, int month, int day, int hour, int minute, int second);
+-		public Soup.Date copy ();
+-		public void free ();
+-		[CCode (has_construct_function = false)]
+-		public Date.from_now (int offset_seconds);
+-		[CCode (has_construct_function = false)]
+-		public Date.from_string (string date_string);
+-		[CCode (has_construct_function = false)]
+-		public Date.from_time_t ([CCode (type = "time_t")] time_t when);
+-		public int get_day ();
+-		public int get_hour ();
+-		public int get_minute ();
+-		public int get_month ();
+-		public int get_offset ();
+-		public int get_second ();
+-		public int get_utc ();
+-		public int get_year ();
+-		public bool is_past ();
+-		public string to_string (Soup.DateFormat format);
+-		public time_t to_time_t ();
+-		public GLib.TimeVal to_timeval ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_logger_get_type ()")]
+-	public class Logger : GLib.Object, Soup.SessionFeature {
+-		[CCode (has_construct_function = false)]
+-		public Logger (Soup.LoggerLogLevel level, int max_body_size);
+-		public void set_printer (owned Soup.LoggerPrinter printer);
+-		public void set_request_filter (owned Soup.LoggerFilter request_filter);
+-		public void set_response_filter (owned Soup.LoggerFilter response_filter);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_message_get_type ()")]
+-	public class Message : GLib.Object {
+-		public weak Soup.MessageBody request_body;
+-		public weak Soup.MessageHeaders request_headers;
+-		public weak Soup.MessageBody response_body;
+-		public weak Soup.MessageHeaders response_headers;
+-		[CCode (has_construct_function = false)]
+-		public Message (string method, string uri_string);
+-		public uint add_header_handler (string @signal, string header, GLib.Callback callback);
+-		public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback);
+-		public void disable_feature (GLib.Type feature_type);
+-		[CCode (has_construct_function = false)]
+-		public Message.from_uri (string method, Soup.URI uri);
+-		public unowned Soup.Address get_address ();
+-		public unowned Soup.URI get_first_party ();
+-		public Soup.MessageFlags get_flags ();
+-		public Soup.HTTPVersion get_http_version ();
+-		public bool get_https_status (out unowned GLib.TlsCertificate certificate, out GLib.TlsCertificateFlags errors);
+-		public unowned Soup.URI get_uri ();
+-		public bool is_keepalive ();
+-		public void set_chunk_allocator (owned Soup.ChunkAllocator allocator);
+-		public void set_first_party (Soup.URI first_party);
+-		public void set_flags (Soup.MessageFlags flags);
+-		public void set_http_version (Soup.HTTPVersion version);
+-		public void set_redirect (uint status_code, string redirect_uri);
+-		public void set_request (string content_type, Soup.MemoryUse req_use, [CCode (array_length_cname = "req_length", array_length_pos = 3.1, array_length_type = "gsize", type = "char*")] uint8[] req_body);
+-		public void set_response (string? content_type, Soup.MemoryUse resp_use, [CCode (array_length_cname = "resp_length", array_length_pos = 3.1, array_length_type = "gsize")] uint8[] resp_body);
+-		public void set_status (uint status_code);
+-		public void set_status_full (uint status_code, string reason_phrase);
+-		public void set_uri (Soup.URI uri);
+-		public Soup.URI first_party { get; set; }
+-		public Soup.MessageFlags flags { get; set; }
+-		public Soup.HTTPVersion http_version { get; set; }
+-		[NoAccessorMethod]
+-		public string method { owned get; set; }
+-		[NoAccessorMethod]
+-		public string reason_phrase { owned get; set; }
+-		[NoAccessorMethod]
+-		public bool server_side { get; construct; }
+-		[NoAccessorMethod]
+-		public uint status_code { get; set; }
+-		[NoAccessorMethod]
+-		public GLib.TlsCertificate tls_certificate { owned get; set; }
+-		[NoAccessorMethod]
+-		public GLib.TlsCertificateFlags tls_errors { get; set; }
+-		public Soup.URI uri { get; set; }
+-		[HasEmitter]
+-		public signal void content_sniffed (string content_type, GLib.HashTable<string,string> @params);
+-		[HasEmitter]
+-		public virtual signal void finished ();
+-		[HasEmitter]
+-		public virtual signal void got_body ();
+-		[HasEmitter]
+-		public virtual signal void got_chunk (Soup.Buffer chunk);
+-		[HasEmitter]
+-		public virtual signal void got_headers ();
+-		[HasEmitter]
+-		public virtual signal void got_informational ();
+-		public signal void network_event (GLib.SocketClientEvent event, GLib.IOStream connection);
+-		[HasEmitter]
+-		public virtual signal void restarted ();
+-		[HasEmitter]
+-		public virtual signal void wrote_body ();
+-		[HasEmitter]
+-		public signal void wrote_body_data (Soup.Buffer chunk);
+-		[HasEmitter]
+-		public virtual signal void wrote_chunk ();
+-		[HasEmitter]
+-		public virtual signal void wrote_headers ();
+-		[HasEmitter]
+-		public virtual signal void wrote_informational ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_message_body_get_type ()")]
+-	[Compact]
+-	public class MessageBody {
+-		[CCode (array_length_cname = "length", array_length_type = "gint64")]
+-		public uint8[] data;
+-		public int64 length;
+-		[CCode (has_construct_function = false)]
+-		public MessageBody ();
+-		public void append (Soup.MemoryUse use, [CCode (array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize")] uint8[] data);
+-		public void append_buffer (Soup.Buffer buffer);
+-		public void append_take ([CCode (array_length_cname = "length", array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data);
+-		public void complete ();
+-		public Soup.Buffer flatten ();
+-		public void free ();
+-		public bool get_accumulate ();
+-		public Soup.Buffer get_chunk (int64 offset);
+-		public void got_chunk (Soup.Buffer chunk);
+-		public void set_accumulate (bool accumulate);
+-		public void truncate ();
+-		public void wrote_chunk (Soup.Buffer chunk);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_message_headers_get_type ()")]
+-	[Compact]
+-	public class MessageHeaders {
+-		[CCode (has_construct_function = false)]
+-		public MessageHeaders (Soup.MessageHeadersType type);
+-		public void append (string name, string value);
+-		public void clean_connection_headers ();
+-		public void clear ();
+-		public void @foreach (Soup.MessageHeadersForeachFunc func);
+-		public void free ();
+-		public void free_ranges (Soup.Range ranges);
+-		public unowned string @get (string name);
+-		public bool get_content_disposition (out string disposition, out GLib.HashTable<string,string> @params);
+-		public int64 get_content_length ();
+-		public bool get_content_range (int64 start, int64 end, int64 total_length);
+-		public unowned string get_content_type (out GLib.HashTable<string,string> @params);
+-		public Soup.Encoding get_encoding ();
+-		public Soup.Expectation get_expectations ();
+-		public unowned string get_list (string name);
+-		public unowned string get_one (string name);
+-		public bool get_ranges (int64 total_length, [CCode (array_length_cname = "length", array_length_pos = 2.1, type = "SoupRange**")] out Soup.Range[] ranges);
+-		public void remove (string name);
+-		public void replace (string name, string value);
+-		public void set_content_disposition (string disposition, GLib.HashTable<string,string>? @params);
+-		public void set_content_length (int64 content_length);
+-		public void set_content_range (int64 start, int64 end, int64 total_length);
+-		public void set_content_type (string content_type, GLib.HashTable<string,string>? @params);
+-		public void set_encoding (Soup.Encoding encoding);
+-		public void set_expectations (Soup.Expectation expectations);
+-		public void set_range (int64 start, int64 end);
+-		public void set_ranges (Soup.Range ranges, int length);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Compact]
+-	public class MessageQueue {
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Compact]
+-	public class MessageQueueItem {
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_multipart_get_type ()")]
+-	[Compact]
+-	public class Multipart {
+-		[CCode (has_construct_function = false)]
+-		public Multipart (string mime_type);
+-		public void append_form_file (string control_name, string filename, string content_type, Soup.Buffer body);
+-		public void append_form_string (string control_name, string data);
+-		public void append_part (Soup.MessageHeaders headers, Soup.Buffer body);
+-		public void free ();
+-		[CCode (has_construct_function = false)]
+-		public Multipart.from_message (Soup.MessageHeaders headers, Soup.MessageBody body);
+-		public int get_length ();
+-		public bool get_part (int part, out unowned Soup.MessageHeaders headers, out unowned Soup.Buffer body);
+-		public void to_message (Soup.MessageHeaders dest_headers, Soup.MessageBody dest_body);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_proxy_resolver_default_get_type ()")]
+-	public class ProxyResolverDefault : GLib.Object, Soup.ProxyURIResolver, Soup.SessionFeature {
+-		[CCode (has_construct_function = false)]
+-		protected ProxyResolverDefault ();
+-		[NoAccessorMethod]
+-		public GLib.ProxyResolver gproxy_resolver { set; }
+-	}
+-	[CCode (cheader_filename = "libsoup/soup-request.h", type_id = "soup_request_get_type ()")]
+-	public class Request : GLib.Object {
+-		public class string[] schemes;
+-
+-		[CCode (has_construct_function = false)]
+-		protected Request ();
+-
+-		public virtual bool check_uri(Soup.URI uri) throws GLib.Error;
+-		public virtual GLib.InputStream? send(GLib.Cancellable? cancellable) throws GLib.Error;
+-		public virtual void send_async(GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback) throws GLib.Error;
+-		public virtual GLib.InputStream? send_finish(GLib.AsyncResult result) throws GLib.Error;
+-		public virtual int64 get_content_length();
+-		public virtual unowned string? get_content_type();
+-
+-		public Soup.Session session { get; }
+-		public Soup.URI uri { get; }
+-	}
+-	[CCode (cheader_filename = "libsoup/soup-requester.h", type_id = "soup_requester_get_type ()")]
+-	public class Requester : GLib.Object, Soup.SessionFeature {
+-		public Requester();
+-
+-		public Soup.Request request(string uri_string) throws GLib.Error;
+-		public Soup.Request request_uri(Soup.URI uri) throws GLib.Error;
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_server_get_type ()")]
+-	public class Server : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public Server (string optname1, ...);
+-		public void add_auth_domain (Soup.AuthDomain auth_domain);
+-		public void add_handler (string? path, owned Soup.ServerCallback callback);
+-		public void disconnect ();
+-		public unowned GLib.MainContext get_async_context ();
+-		public unowned Soup.Socket get_listener ();
+-		public uint get_port ();
+-		public bool is_https ();
+-		public void pause_message (Soup.Message msg);
+-		public void quit ();
+-		public void remove_auth_domain (Soup.AuthDomain auth_domain);
+-		public void remove_handler (string path);
+-		public void run ();
+-		public void run_async ();
+-		public void unpause_message (Soup.Message msg);
+-		public GLib.MainContext async_context { get; owned construct; }
+-		[NoAccessorMethod]
+-		public Soup.Address @interface { owned get; construct; }
+-		public uint port { get; construct; }
+-		[NoAccessorMethod]
+-		public bool raw_paths { get; construct; }
+-		[NoAccessorMethod]
+-		public string server_header { owned get; set construct; }
+-		[NoAccessorMethod]
+-		public string ssl_cert_file { owned get; construct; }
+-		[NoAccessorMethod]
+-		public string ssl_key_file { owned get; construct; }
+-		[NoAccessorMethod]
+-		public GLib.TlsCertificate tls_certificate { owned get; construct; }
+-		public virtual signal void request_aborted (Soup.Message msg, Soup.ClientContext client);
+-		public virtual signal void request_finished (Soup.Message msg, Soup.ClientContext client);
+-		public virtual signal void request_read (Soup.Message msg, Soup.ClientContext client);
+-		public virtual signal void request_started (Soup.Message msg, Soup.ClientContext client);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_session_get_type ()")]
+-	public abstract class Session : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		protected Session ();
+-		public void abort ();
+-		public void add_feature (Soup.SessionFeature feature);
+-		public void add_feature_by_type (GLib.Type feature_type);
+-		[NoWrapper]
+-		public virtual void auth_required (Soup.Message msg, Soup.Auth auth, bool retrying);
+-		public virtual void cancel_message (Soup.Message msg, uint status_code);
+-		[NoWrapper]
+-		public virtual void flush_queue ();
+-		public unowned GLib.MainContext get_async_context ();
+-		public unowned Soup.SessionFeature get_feature (GLib.Type feature_type);
+-		public unowned Soup.SessionFeature get_feature_for_message (GLib.Type feature_type, Soup.Message msg);
+-		public GLib.SList<Soup.SessionFeature> get_features (GLib.Type feature_type);
+-		[NoWrapper]
+-		public virtual void kick ();
+-		public void pause_message (Soup.Message msg);
+-		public void prepare_for_uri (Soup.URI uri);
+-		public virtual void queue_message (owned Soup.Message msg, Soup.SessionCallback? callback);
+-		public bool redirect_message (Soup.Message msg);
+-		public void remove_feature (Soup.SessionFeature feature);
+-		public void remove_feature_by_type (GLib.Type feature_type);
+-		public virtual void requeue_message (Soup.Message msg);
+-		public virtual uint send_message (Soup.Message msg);
+-		public void unpause_message (Soup.Message msg);
+-		public bool would_redirect (Soup.Message msg);
+-		[NoAccessorMethod]
+-		public string accept_language { owned get; set; }
+-		[NoAccessorMethod]
+-		public bool accept_language_auto { get; set; }
+-		public GLib.MainContext async_context { get; owned construct; }
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		[NoAccessorMethod]
+-		public string[] http_aliases { owned get; set; }
+-		[CCode (array_length = false, array_null_terminated = true)]
+-		[NoAccessorMethod]
+-		public string[] https_aliases { owned get; set; }
+-		[NoAccessorMethod]
+-		public uint idle_timeout { get; set; }
+-		[NoAccessorMethod]
+-		public int max_conns { get; set; }
+-		[NoAccessorMethod]
+-		public int max_conns_per_host { get; set; }
+-		[NoAccessorMethod]
+-		public Soup.URI proxy_uri { owned get; set; }
+-		[NoAccessorMethod]
+-		public string ssl_ca_file { owned get; set; }
+-		[NoAccessorMethod]
+-		public bool ssl_strict { get; set; }
+-		[NoAccessorMethod]
+-		public bool ssl_use_system_ca_file { get; set; }
+-		[NoAccessorMethod]
+-		public uint timeout { get; set; }
+-		[NoAccessorMethod]
+-		public GLib.TlsDatabase tls_database { owned get; set; }
+-		[NoAccessorMethod]
+-		public bool use_ntlm { get; set; }
+-		[NoAccessorMethod]
+-		public bool use_thread_context { get; set; }
+-		[NoAccessorMethod]
+-		public string user_agent { owned get; set; }
+-		public virtual signal void authenticate (Soup.Message msg, Soup.Auth auth, bool retrying);
+-		public signal void connection_created (GLib.Object connection);
+-		public signal void request_queued (Soup.Message msg);
+-		public virtual signal void request_started (Soup.Message msg, Soup.Socket socket);
+-		public signal void request_unqueued (Soup.Message msg);
+-		public signal void tunneling (GLib.Object connection);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_session_async_get_type ()")]
+-	public class SessionAsync : Soup.Session {
+-		[CCode (has_construct_function = false, type = "SoupSession*")]
+-		public SessionAsync ();
+-		[CCode (has_construct_function = false, type = "SoupSession*")]
+-		public SessionAsync.with_options (string optname1, ...);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_session_sync_get_type ()")]
+-	public class SessionSync : Soup.Session {
+-		[CCode (has_construct_function = false, type = "SoupSession*")]
+-		public SessionSync ();
+-		[CCode (has_construct_function = false, type = "SoupSession*")]
+-		public SessionSync.with_options (string optname1, ...);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_socket_get_type ()")]
+-	public class Socket : GLib.Object {
+-		[CCode (has_construct_function = false)]
+-		public Socket (string optname1, ...);
+-		public void connect_async (GLib.Cancellable? cancellable, Soup.SocketCallback callback);
+-		public uint connect_sync (GLib.Cancellable? cancellable);
+-		public void disconnect ();
+-		public int get_fd ();
+-		public unowned Soup.Address get_local_address ();
+-		public unowned Soup.Address get_remote_address ();
+-		public bool is_connected ();
+-		public bool is_ssl ();
+-		public bool listen ();
+-		public Soup.SocketIOStatus read ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gsize", type = "gpointer")] uint8[] buffer, out size_t nread, GLib.Cancellable? cancellable) throws GLib.Error;
+-		public Soup.SocketIOStatus read_until ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gsize", type = "gpointer")] uint8[] buffer, void* boundary, size_t boundary_len, out size_t nread, bool got_boundary, GLib.Cancellable? cancellable) throws GLib.Error;
+-		public bool start_proxy_ssl (string ssl_host, GLib.Cancellable? cancellable);
+-		public bool start_ssl (GLib.Cancellable? cancellable);
+-		public Soup.SocketIOStatus write ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gsize", type = "gconstpointer")] uint8[] buffer, out size_t nwrote, GLib.Cancellable? cancellable) throws GLib.Error;
+-		[NoAccessorMethod]
+-		public GLib.MainContext async_context { owned get; construct; }
+-		public bool clean_dispose { construct; }
+-		[NoAccessorMethod]
+-		public bool is_server { get; }
+-		public Soup.Address local_address { get; construct; }
+-		[NoAccessorMethod]
+-		public bool non_blocking { get; set; }
+-		public Soup.Address remote_address { get; construct; }
+-		[NoAccessorMethod]
+-		public void* ssl_creds { get; set; }
+-		[NoAccessorMethod]
+-		public bool ssl_fallback { get; construct; }
+-		[NoAccessorMethod]
+-		public bool ssl_strict { get; construct; }
+-		[NoAccessorMethod]
+-		public uint timeout { get; set; }
+-		[NoAccessorMethod]
+-		public GLib.TlsCertificate tls_certificate { owned get; }
+-		[NoAccessorMethod]
+-		public GLib.TlsCertificateFlags tls_errors { get; }
+-		[NoAccessorMethod]
+-		public bool trusted_certificate { get; }
+-		[NoAccessorMethod]
+-		public bool use_thread_context { get; construct; }
+-		public virtual signal void disconnected ();
+-		public signal void event (GLib.SocketClientEvent event, GLib.IOStream connection);
+-		public virtual signal void new_connection (Soup.Socket arg1);
+-		public virtual signal void readable ();
+-		public virtual signal void writable ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_uri_get_type ()")]
+-	[Compact]
+-	public class URI {
+-		public weak string fragment;
+-		public weak string host;
+-		public weak string password;
+-		public weak string path;
+-		public uint port;
+-		public weak string query;
+-		public weak string scheme;
+-		public weak string user;
+-		[CCode (has_construct_function = false)]
+-		public URI (string uri_string);
+-		public Soup.URI copy ();
+-		public Soup.URI copy_host ();
+-		public static string decode (string part);
+-		public static string encode (string part, string? escape_extra);
+-		public bool equal (Soup.URI uri2);
+-		public void free ();
+-		public unowned string get_fragment ();
+-		public unowned string get_host ();
+-		public unowned string get_password ();
+-		public unowned string get_path ();
+-		public uint get_port ();
+-		public unowned string get_query ();
+-		public unowned string get_scheme ();
+-		public unowned string get_user ();
+-		public bool host_equal (Soup.URI v2);
+-		public uint host_hash ();
+-		public static string normalize (string part, string unescape_extra);
+-		public void set_fragment (string? fragment);
+-		public void set_host (string? host);
+-		public void set_password (string? password);
+-		public void set_path (string path);
+-		public void set_port (uint port);
+-		public void set_query (string? query);
+-		public void set_query_from_fields (...);
+-		public void set_query_from_form (GLib.HashTable<string,string> form);
+-		public void set_scheme (string scheme);
+-		public void set_user (string? user);
+-		public string to_string (bool just_path_and_query);
+-		public bool uses_default_port ();
+-		[CCode (has_construct_function = false)]
+-		public URI.with_base (Soup.URI @base, string uri_string);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyResolverInterface", type_id = "soup_proxy_resolver_get_type ()")]
+-	[Version ( deprecated = true, replacement = "Soup.ProxyURIResolver" )]
+-	public interface ProxyResolver : Soup.SessionFeature, GLib.Object {
+-		public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, GLib.Cancellable? cancellable, Soup.ProxyResolverCallback callaback);
+-		public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable? cancellable, out unowned Soup.Address addr);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyURIResolverInterface", type_id = "soup_proxy_uri_resolver_get_type ()")]
+-	public interface ProxyURIResolver : GLib.Object {
+-		public abstract void get_proxy_uri_async (Soup.URI uri, GLib.MainContext? async_context, GLib.Cancellable? cancellable, Soup.ProxyURIResolverCallback callback);
+-		public abstract uint get_proxy_uri_sync (Soup.URI uri, GLib.Cancellable? cancellable, out Soup.URI proxy_uri);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupSessionFeatureInterface", type_id = "soup_session_feature_get_type ()")]
+-	public interface SessionFeature : GLib.Object {
+-		public abstract bool add_feature (GLib.Type type);
+-		public abstract void attach (Soup.Session session);
+-		public abstract void detach (Soup.Session session);
+-		public abstract bool has_feature (GLib.Type type);
+-		public abstract bool remove_feature (GLib.Type type);
+-		[NoWrapper]
+-		public abstract void request_queued (Soup.Session session, Soup.Message msg);
+-		[NoWrapper]
+-		public abstract void request_started (Soup.Session session, Soup.Message msg, Soup.Socket socket);
+-		[NoWrapper]
+-		public abstract void request_unqueued (Soup.Session session, Soup.Message msg);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
+-	public struct MessageHeadersIter {
+-		public void init (Soup.MessageHeaders hdrs);
+-		public bool next (out unowned string name, out unowned string value);
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
+-	public struct Range {
+-		public int64 start;
+-		public int64 end;
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ADDRESS_FAMILY_")]
+-	public enum AddressFamily {
+-		INVALID,
+-		IPV4,
+-		IPV6
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_RESPONSE_")]
+-	public enum CacheResponse {
+-		FRESH,
+-		NEEDS_VALIDATION,
+-		STALE
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_")]
+-	public enum CacheType {
+-		SINGLE_USER,
+-		SHARED
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_")]
+-	[Flags]
+-	public enum Cacheability {
+-		CACHEABLE,
+-		UNCACHEABLE,
+-		INVALIDATES,
+-		VALIDATES
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CONNECTION_")]
+-	public enum ConnectionState {
+-		NEW,
+-		CONNECTING,
+-		IDLE,
+-		IN_USE,
+-		REMOTE_DISCONNECTED,
+-		DISCONNECTED
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_COOKIE_JAR_ACCEPT_")]
+-	public enum CookieJarAcceptPolicy {
+-		ALWAYS,
+-		NEVER,
+-		NO_THIRD_PARTY
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_DATE_")]
+-	public enum DateFormat {
+-		HTTP,
+-		COOKIE,
+-		RFC2822,
+-		ISO8601_COMPACT,
+-		ISO8601_FULL,
+-		ISO8601,
+-		ISO8601_XMLRPC
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ENCODING_")]
+-	public enum Encoding {
+-		UNRECOGNIZED,
+-		NONE,
+-		CONTENT_LENGTH,
+-		EOF,
+-		CHUNKED,
+-		BYTERANGES
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_EXPECTATION_")]
+-	[Flags]
+-	public enum Expectation {
+-		UNRECOGNIZED,
+-		CONTINUE
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_HTTP_")]
+-	public enum HTTPVersion {
+-		@1_0,
+-		@1_1
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_")]
+-	public enum KnownStatusCode {
+-		NONE,
+-		CANCELLED,
+-		CANT_RESOLVE,
+-		CANT_RESOLVE_PROXY,
+-		CANT_CONNECT,
+-		CANT_CONNECT_PROXY,
+-		SSL_FAILED,
+-		IO_ERROR,
+-		MALFORMED,
+-		TRY_AGAIN,
+-		TOO_MANY_REDIRECTS,
+-		TLS_FAILED,
+-		CONTINUE,
+-		SWITCHING_PROTOCOLS,
+-		PROCESSING,
+-		OK,
+-		CREATED,
+-		ACCEPTED,
+-		NON_AUTHORITATIVE,
+-		NO_CONTENT,
+-		RESET_CONTENT,
+-		PARTIAL_CONTENT,
+-		MULTI_STATUS,
+-		MULTIPLE_CHOICES,
+-		MOVED_PERMANENTLY,
+-		FOUND,
+-		MOVED_TEMPORARILY,
+-		SEE_OTHER,
+-		NOT_MODIFIED,
+-		USE_PROXY,
+-		NOT_APPEARING_IN_THIS_PROTOCOL,
+-		TEMPORARY_REDIRECT,
+-		BAD_REQUEST,
+-		UNAUTHORIZED,
+-		PAYMENT_REQUIRED,
+-		FORBIDDEN,
+-		NOT_FOUND,
+-		METHOD_NOT_ALLOWED,
+-		NOT_ACCEPTABLE,
+-		PROXY_AUTHENTICATION_REQUIRED,
+-		PROXY_UNAUTHORIZED,
+-		REQUEST_TIMEOUT,
+-		CONFLICT,
+-		GONE,
+-		LENGTH_REQUIRED,
+-		PRECONDITION_FAILED,
+-		REQUEST_ENTITY_TOO_LARGE,
+-		REQUEST_URI_TOO_LONG,
+-		UNSUPPORTED_MEDIA_TYPE,
+-		REQUESTED_RANGE_NOT_SATISFIABLE,
+-		INVALID_RANGE,
+-		EXPECTATION_FAILED,
+-		UNPROCESSABLE_ENTITY,
+-		LOCKED,
+-		FAILED_DEPENDENCY,
+-		INTERNAL_SERVER_ERROR,
+-		NOT_IMPLEMENTED,
+-		BAD_GATEWAY,
+-		SERVICE_UNAVAILABLE,
+-		GATEWAY_TIMEOUT,
+-		HTTP_VERSION_NOT_SUPPORTED,
+-		INSUFFICIENT_STORAGE,
+-		NOT_EXTENDED
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_LOGGER_LOG_")]
+-	public enum LoggerLogLevel {
+-		NONE,
+-		MINIMAL,
+-		HEADERS,
+-		BODY
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MEMORY_")]
+-	public enum MemoryUse {
+-		STATIC,
+-		TAKE,
+-		COPY,
+-		TEMPORARY
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_")]
+-	[Flags]
+-	public enum MessageFlags {
+-		NO_REDIRECT,
+-		CAN_REBUILD,
+-		OVERWRITE_CHUNKS,
+-		CONTENT_DECODED,
+-		CERTIFICATE_TRUSTED,
+-		NEW_CONNECTION
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_HEADERS_")]
+-	public enum MessageHeadersType {
+-		REQUEST,
+-		RESPONSE,
+-		MULTIPART
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_REQUESTER_ERROR_")]
+-	public enum RequesterError {
+-		BAD_URI,
+-		UNSUPPORTED_URI_SCHEME
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SOCKET_")]
+-	public enum SocketIOStatus {
+-		OK,
+-		WOULD_BLOCK,
+-		EOF,
+-		ERROR
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public errordomain SSLError {
+-		HANDSHAKE_NEEDS_READ,
+-		HANDSHAKE_NEEDS_WRITE,
+-		CERTIFICATE,
+-		HANDSHAKE_FAILED;
+-		public static GLib.Quark quark ();
+-	}
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
+-	public delegate void AddressCallback (Soup.Address addr, uint status);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 4.9)]
+-	public delegate bool AuthDomainBasicAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username, string password);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 3.9)]
+-	public delegate string AuthDomainDigestAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
+-	public delegate bool AuthDomainFilter (Soup.AuthDomain domain, Soup.Message msg);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 3.9)]
+-	public delegate bool AuthDomainGenericAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
+-	public delegate Soup.Buffer ChunkAllocator (Soup.Message msg, size_t max_len);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
+-	public delegate Soup.LoggerLogLevel LoggerFilter (Soup.Logger logger, Soup.Message msg);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 4.9)]
+-	public delegate void LoggerPrinter (Soup.Logger logger, Soup.LoggerLogLevel level, char direction, string data);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
+-	public delegate void MessageHeadersForeachFunc (string name, string value);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4);
+-	[CCode (cheader_filename = "libsoup/soup.h", has_target = false)]
+-	public delegate void ProxyURIResolverCallback (Soup.ProxyURIResolver resolver, uint status, Soup.URI proxy_uri);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 5.9)]
+-	public delegate void ServerCallback (Soup.Server server, Soup.Message msg, string path, GLib.HashTable<string,string>? query, Soup.ClientContext client);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
+-	public delegate void SessionCallback (Soup.Session session, Soup.Message msg);
+-	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
+-	public delegate void SocketCallback (Soup.Socket sock, uint status);
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_ANY_PORT")]
+-	public const int ADDRESS_ANY_PORT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_FAMILY")]
+-	public const string ADDRESS_FAMILY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_NAME")]
+-	public const string ADDRESS_NAME;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_PHYSICAL")]
+-	public const string ADDRESS_PHYSICAL;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_PORT")]
+-	public const string ADDRESS_PORT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_ADDRESS_SOCKADDR")]
+-	public const string ADDRESS_SOCKADDR;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_ADD_PATH")]
+-	public const string AUTH_DOMAIN_ADD_PATH;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK")]
+-	public const string AUTH_DOMAIN_BASIC_AUTH_CALLBACK;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA")]
+-	public const string AUTH_DOMAIN_BASIC_AUTH_DATA;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_BASIC_H")]
+-	public const int AUTH_DOMAIN_BASIC_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK")]
+-	public const string AUTH_DOMAIN_DIGEST_AUTH_CALLBACK;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA")]
+-	public const string AUTH_DOMAIN_DIGEST_AUTH_DATA;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_DIGEST_H")]
+-	public const int AUTH_DOMAIN_DIGEST_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_FILTER")]
+-	public const string AUTH_DOMAIN_FILTER;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_FILTER_DATA")]
+-	public const string AUTH_DOMAIN_FILTER_DATA;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK")]
+-	public const string AUTH_DOMAIN_GENERIC_AUTH_CALLBACK;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA")]
+-	public const string AUTH_DOMAIN_GENERIC_AUTH_DATA;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_H")]
+-	public const int AUTH_DOMAIN_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_PROXY")]
+-	public const string AUTH_DOMAIN_PROXY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_REALM")]
+-	public const string AUTH_DOMAIN_REALM;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_REMOVE_PATH")]
+-	public const string AUTH_DOMAIN_REMOVE_PATH;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_H")]
+-	public const int AUTH_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_HOST")]
+-	public const string AUTH_HOST;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_IS_AUTHENTICATED")]
+-	public const string AUTH_IS_AUTHENTICATED;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_IS_FOR_PROXY")]
+-	public const string AUTH_IS_FOR_PROXY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_REALM")]
+-	public const string AUTH_REALM;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_SCHEME_NAME")]
+-	public const string AUTH_SCHEME_NAME;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CACHE_H")]
+-	public const int CACHE_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_HTTP_CTL")]
+-	public const int CHAR_HTTP_CTL;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_HTTP_SEPARATOR")]
+-	public const int CHAR_HTTP_SEPARATOR;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_URI_GEN_DELIMS")]
+-	public const int CHAR_URI_GEN_DELIMS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_URI_PERCENT_ENCODED")]
+-	public const int CHAR_URI_PERCENT_ENCODED;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_URI_SUB_DELIMS")]
+-	public const int CHAR_URI_SUB_DELIMS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CONTENT_DECODER_H")]
+-	public const int CONTENT_DECODER_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CONTENT_SNIFFER_H")]
+-	public const int CONTENT_SNIFFER_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_H")]
+-	public const int COOKIE_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_ACCEPT_POLICY")]
+-	public const string COOKIE_JAR_ACCEPT_POLICY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_H")]
+-	public const int COOKIE_JAR_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_READ_ONLY")]
+-	public const string COOKIE_JAR_READ_ONLY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_TEXT_FILENAME")]
+-	public const string COOKIE_JAR_TEXT_FILENAME;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_TEXT_H")]
+-	public const int COOKIE_JAR_TEXT_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_MAX_AGE_ONE_DAY")]
+-	public const int COOKIE_MAX_AGE_ONE_DAY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_MAX_AGE_ONE_HOUR")]
+-	public const int COOKIE_MAX_AGE_ONE_HOUR;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_MAX_AGE_ONE_WEEK")]
+-	public const int COOKIE_MAX_AGE_ONE_WEEK;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_MAX_AGE_ONE_YEAR")]
+-	public const int COOKIE_MAX_AGE_ONE_YEAR;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_DATE_H")]
+-	public const int DATE_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_FORM_H")]
+-	public const int FORM_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_FORM_MIME_TYPE_MULTIPART")]
+-	public const string FORM_MIME_TYPE_MULTIPART;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_FORM_MIME_TYPE_URLENCODED")]
+-	public const string FORM_MIME_TYPE_URLENCODED;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_HEADERS_H")]
+-	public const int HEADERS_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_LOGGER_H")]
+-	public const int LOGGER_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_BODY_H")]
+-	public const int MESSAGE_BODY_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_FIRST_PARTY")]
+-	public const string MESSAGE_FIRST_PARTY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_FLAGS")]
+-	public const string MESSAGE_FLAGS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_H")]
+-	public const int MESSAGE_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_HEADERS_H")]
+-	public const int MESSAGE_HEADERS_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_HTTP_VERSION")]
+-	public const string MESSAGE_HTTP_VERSION;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_METHOD")]
+-	public const string MESSAGE_METHOD;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_REASON_PHRASE")]
+-	public const string MESSAGE_REASON_PHRASE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_REQUEST_BODY")]
+-	public const string MESSAGE_REQUEST_BODY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_REQUEST_HEADERS")]
+-	public const string MESSAGE_REQUEST_HEADERS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_RESPONSE_BODY")]
+-	public const string MESSAGE_RESPONSE_BODY;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_RESPONSE_HEADERS")]
+-	public const string MESSAGE_RESPONSE_HEADERS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_SERVER_SIDE")]
+-	public const string MESSAGE_SERVER_SIDE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_STATUS_CODE")]
+-	public const string MESSAGE_STATUS_CODE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_TLS_CERTIFICATE")]
+-	public const string MESSAGE_TLS_CERTIFICATE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_TLS_ERRORS")]
+-	public const string MESSAGE_TLS_ERRORS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_URI")]
+-	public const string MESSAGE_URI;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_METHOD_H")]
+-	public const int METHOD_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MISC_H")]
+-	public const int MISC_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MULTIPART_H")]
+-	public const int MULTIPART_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_PASSWORD_MANAGER_H")]
+-	public const int PASSWORD_MANAGER_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_PROXY_RESOLVER_DEFAULT_H")]
+-	public const int PROXY_RESOLVER_DEFAULT_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_PROXY_URI_RESOLVER_H")]
+-	public const int PROXY_URI_RESOLVER_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUESTER_H")]
+-	public const int REQUESTER_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_DATA_H")]
+-	public const int REQUEST_DATA_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_FILE_H")]
+-	public const int REQUEST_FILE_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_H")]
+-	public const int REQUEST_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_HTTP_H")]
+-	public const int REQUEST_HTTP_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_SESSION")]
+-	public const string REQUEST_SESSION;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_URI")]
+-	public const string REQUEST_URI;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_ASYNC_CONTEXT")]
+-	public const string SERVER_ASYNC_CONTEXT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_H")]
+-	public const int SERVER_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_INTERFACE")]
+-	public const string SERVER_INTERFACE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_PORT")]
+-	public const string SERVER_PORT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_RAW_PATHS")]
+-	public const string SERVER_RAW_PATHS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_SERVER_HEADER")]
+-	public const string SERVER_SERVER_HEADER;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_SSL_CERT_FILE")]
+-	public const string SERVER_SSL_CERT_FILE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_SSL_KEY_FILE")]
+-	public const string SERVER_SSL_KEY_FILE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_TLS_CERTIFICATE")]
+-	public const string SERVER_TLS_CERTIFICATE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_ACCEPT_LANGUAGE")]
+-	public const string SESSION_ACCEPT_LANGUAGE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_ACCEPT_LANGUAGE_AUTO")]
+-	public const string SESSION_ACCEPT_LANGUAGE_AUTO;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_ASYNC_CONTEXT")]
+-	public const string SESSION_ASYNC_CONTEXT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_ASYNC_H")]
+-	public const int SESSION_ASYNC_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_FEATURE_H")]
+-	public const int SESSION_FEATURE_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_H")]
+-	public const int SESSION_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_HTTPS_ALIASES")]
+-	public const string SESSION_HTTPS_ALIASES;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_HTTP_ALIASES")]
+-	public const string SESSION_HTTP_ALIASES;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_IDLE_TIMEOUT")]
+-	public const string SESSION_IDLE_TIMEOUT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_MAX_CONNS")]
+-	public const string SESSION_MAX_CONNS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_MAX_CONNS_PER_HOST")]
+-	public const string SESSION_MAX_CONNS_PER_HOST;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_PROXY_URI")]
+-	public const string SESSION_PROXY_URI;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_SSL_CA_FILE")]
+-	public const string SESSION_SSL_CA_FILE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_SSL_STRICT")]
+-	public const string SESSION_SSL_STRICT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE")]
+-	public const string SESSION_SSL_USE_SYSTEM_CA_FILE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_SYNC_H")]
+-	public const int SESSION_SYNC_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_TIMEOUT")]
+-	public const string SESSION_TIMEOUT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_TLS_DATABASE")]
+-	public const string SESSION_TLS_DATABASE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_USER_AGENT")]
+-	public const string SESSION_USER_AGENT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_USE_NTLM")]
+-	public const string SESSION_USE_NTLM;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_USE_THREAD_CONTEXT")]
+-	public const string SESSION_USE_THREAD_CONTEXT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_ASYNC_CONTEXT")]
+-	public const string SOCKET_ASYNC_CONTEXT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_FLAG_NONBLOCKING")]
+-	public const string SOCKET_FLAG_NONBLOCKING;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_H")]
+-	public const int SOCKET_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_IS_SERVER")]
+-	public const string SOCKET_IS_SERVER;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_LOCAL_ADDRESS")]
+-	public const string SOCKET_LOCAL_ADDRESS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_REMOTE_ADDRESS")]
+-	public const string SOCKET_REMOTE_ADDRESS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_SSL_CREDENTIALS")]
+-	public const string SOCKET_SSL_CREDENTIALS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_SSL_FALLBACK")]
+-	public const string SOCKET_SSL_FALLBACK;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_SSL_STRICT")]
+-	public const string SOCKET_SSL_STRICT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_TIMEOUT")]
+-	public const string SOCKET_TIMEOUT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_TLS_CERTIFICATE")]
+-	public const string SOCKET_TLS_CERTIFICATE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_TLS_ERRORS")]
+-	public const string SOCKET_TLS_ERRORS;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_TRUSTED_CERTIFICATE")]
+-	public const string SOCKET_TRUSTED_CERTIFICATE;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_USE_THREAD_CONTEXT")]
+-	public const string SOCKET_USE_THREAD_CONTEXT;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_STATUS_H")]
+-	public const int STATUS_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_TYPES_H")]
+-	public const int TYPES_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_URI_H")]
+-	public const int URI_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_VALUE_UTILS_H")]
+-	public const int VALUE_UTILS_H;
+-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_XMLRPC_H")]
+-	public const int XMLRPC_H;
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static unowned GLib.TimeoutSource add_completion (GLib.MainContext? async_context, GLib.SourceFunc function);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static unowned GLib.TimeoutSource add_idle (GLib.MainContext? async_context, GLib.SourceFunc function);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static unowned GLib.TimeoutSource add_io_watch (GLib.MainContext? async_context, GLib.IOChannel chan, GLib.IOCondition condition, GLib.IOFunc function);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static unowned GLib.TimeoutSource add_timeout (GLib.MainContext? async_context, uint interval, GLib.SourceFunc function);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.SList<Soup.Cookie> cookies_from_request (Soup.Message msg);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.SList<Soup.Cookie> cookies_from_response (Soup.Message msg);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static string cookies_to_cookie_header (GLib.SList<Soup.Cookie> cookies);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void cookies_to_request (GLib.SList<Soup.Cookie> cookies, Soup.Message msg);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void cookies_to_response (GLib.SList<Soup.Cookie> cookies, Soup.Message msg);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.decode", deprecated_since = "vala-0.12" )]
+-	public static GLib.HashTable<string,string> form_decode (string encoded_form);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.decode_multipart", deprecated_since = "vala-0.12" )]
+-	public static GLib.HashTable<string,string> form_decode_multipart (Soup.Message msg, string file_control_name, out string filename, out string content_type, out Soup.Buffer file);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.encode", deprecated_since = "vala-0.12" )]
+-	public static string form_encode (...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.encode_datalist", deprecated_since = "vala-0.12" )]
+-	public static string form_encode_datalist (void* form_data_set);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.encode_hash", deprecated_since = "vala-0.12" )]
+-	public static string form_encode_hash (GLib.HashTable<string,string> form_data_set);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, deprecated_since = "vala-0.12" )]
+-	public static string form_encode_valist (string first_field, void* args);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.request_new", deprecated_since = "vala-0.12" )]
+-	public static Soup.Message form_request_new (string method, string uri, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.request_new_from_datalist", deprecated_since = "vala-0.12" )]
+-	public static Soup.Message form_request_new_from_datalist (string method, string uri, void* form_data_set);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.request_new_from_hash", deprecated_since = "vala-0.12" )]
+-	public static Soup.Message form_request_new_from_hash (string method, string uri, GLib.HashTable<string,string> form_data_set);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "Form.request_new_from_multipart", deprecated_since = "vala-0.12" )]
+-	public static Soup.Message form_request_new_from_multipart (string uri, Soup.Multipart multipart);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool header_contains (string header, string token);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void header_free_param_list (GLib.HashTable<string,string> param_list);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void header_g_string_append_param (GLib.StringBuilder string, string name, string value);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void header_g_string_append_param_quoted (GLib.StringBuilder string, string name, string value);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.SList<string> header_parse_list (string header);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.HashTable<string,string> header_parse_param_list (string header);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.SList<string> header_parse_quality_list (string header, out GLib.SList<string> unacceptable);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.HashTable<string,string> header_parse_semi_param_list (string header);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool headers_parse (string str, int len, Soup.MessageHeaders dest);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static uint headers_parse_request (string str, int len, Soup.MessageHeaders req_headers, out string req_method, out string req_path, out Soup.HTTPVersion ver);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool headers_parse_response (string str, int len, Soup.MessageHeaders headers, out Soup.HTTPVersion ver, out uint status_code, out string reason_phrase);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool headers_parse_status_line (string status_line, out Soup.HTTPVersion ver, out uint status_code, out string reason_phrase);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.Quark http_error_quark ();
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "SSLError.quark", deprecated_since = "vala-0.14" )]
+-	public static GLib.Quark ssl_error_quark ();
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static unowned string status_get_phrase (uint status_code);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static uint status_proxify (uint status_code);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool str_case_equal (void* v1, void* v2);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static uint str_case_hash (void* key);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void value_array_append (GLib.ValueArray array, GLib.Type type, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void value_array_append_vals (GLib.ValueArray array, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.ValueArray value_array_from_args (va_list args);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool value_array_get_nth (GLib.ValueArray array, uint index_, GLib.Type type, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void value_array_insert (GLib.ValueArray array, uint index_, GLib.Type type, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.ValueArray value_array_new ();
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.ValueArray value_array_new_with_vals (...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool value_array_to_args (GLib.ValueArray array, va_list args);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void value_hash_insert (GLib.HashTable<string,GLib.Value?> hash, string key, GLib.Type type, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void value_hash_insert_vals (GLib.HashTable<string,GLib.Value?> hash, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static void value_hash_insert_value (GLib.HashTable<string,GLib.Value?> hash, string key, GLib.Value value);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool value_hash_lookup (GLib.HashTable<string,GLib.Value?> hash, string key, GLib.Type type, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static bool value_hash_lookup_vals (GLib.HashTable<string,GLib.Value?> hash, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.HashTable<string,GLib.Value?> value_hash_new ();
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	public static GLib.HashTable<string,GLib.Value?> value_hash_new_with_vals (...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.build_fault", deprecated_since = "vala-0.12" )]
+-	[PrintfFormat]
+-	public static unowned string xmlrpc_build_fault (int fault_code, string fault_format, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.build_method_call", deprecated_since = "vala-0.12" )]
+-	public static unowned string xmlrpc_build_method_call (string method_name, GLib.Value[] @params);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.build_method_response", deprecated_since = "vala-0.12" )]
+-	public static unowned string xmlrpc_build_method_response (GLib.Value value);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.error_quark", deprecated_since = "vala-0.12" )]
+-	public static GLib.Quark xmlrpc_error_quark ();
+-	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.extract_method_call", deprecated_since = "vala-0.12" )]
+-	public static bool xmlrpc_extract_method_call (string method_call, int length, out unowned string method_name, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.extract_method_response", deprecated_since = "vala-0.12" )]
+-	public static bool xmlrpc_extract_method_response (string method_response, int length, ...) throws GLib.Error;
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.fault_quark", deprecated_since = "vala-0.12" )]
+-	public static GLib.Quark xmlrpc_fault_quark ();
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.parse_method_call", deprecated_since = "vala-0.12" )]
+-	public static bool xmlrpc_parse_method_call (string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray @params);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.parse_method_response", deprecated_since = "vala-0.12" )]
+-	public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value value) throws GLib.Error;
+-	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.request_new", deprecated_since = "vala-0.12" )]
+-	public static unowned Soup.Message xmlrpc_request_new (string uri, string method_name, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.set_fault", deprecated_since = "vala-0.12" )]
+-	[PrintfFormat]
+-	public static void xmlrpc_set_fault (Soup.Message msg, int fault_code, string fault_format, ...);
+-	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+-	[Version ( deprecated = true, replacement = "XMLRPC.set_response", deprecated_since = "vala-0.12" )]
+-	public static void xmlrpc_set_response (Soup.Message msg, ...);
+-}
+-- 
+GitLab
+
diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index 0e6fffaac53..fc7903de777 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -1,7 +1,7 @@
 # Template file for 'gitg'
 pkgname=gitg
 version=3.32.1
-revision=3
+revision=4
 build_style=meson
 build_helper="qemu"
 hostmakedepends="intltool gettext glib-devel gobject-introspection pkg-config vala"

From 62aa633ad3ffbf852154c4b887f5ede830fafb90 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0476/1118] glade3: update to 3.38.1

---
 srcpkgs/glade3/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index d3d8e0d5dcf..ffdc919e2ef 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,6 +1,6 @@
 # Template file for 'glade3'
 pkgname=glade3
-version=3.38.0
+version=3.38.1
 revision=1
 wrksrc="glade-${version}"
 build_style=meson
@@ -15,13 +15,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://glade.gnome.org/"
 distfiles="${GNOME_SITE}/glade/${version%.*}/glade-${version}.tar.xz"
-checksum=4a914c5c0b19c2e52fd4ad15077d406dbfd6ad0245e239d7390bf87f27d9103c
+checksum=171a50be4930d4806fc8ce7f5ce3a75b49e9916f9d3037a5b50d35799bd0cfcd
 lib32disabled=yes
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i meson.build -e "/python_dep/s/3.8/3.9/g"
+}
+
 do_check() {
 	# Require running xserver
 	:

From d3463afe1fb7c09b44823eede9945598b704a973 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0477/1118] glusterfs: rebuild for Python 3.9

---
 srcpkgs/glusterfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 1690b13bebf..06f1939d12a 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
 version=7.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no

From 62edd28ce834ad724fdbc663ba68e566f3bf1681 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0478/1118] gnome-authenticator: rebuild for Python 3.9

---
 srcpkgs/gnome-authenticator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template
index d9bea508028..e1bd1ee9e44 100644
--- a/srcpkgs/gnome-authenticator/template
+++ b/srcpkgs/gnome-authenticator/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-authenticator'
 pkgname=gnome-authenticator
 version=3.32.2
-revision=2
+revision=3
 wrksrc="Authenticator-${version}"
 build_style=meson
 build_helper="gir"

From 122912d37128c39f9398ecedc62f969b126de11d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0479/1118] gnome-builder: rebuild for Python 3.9

---
 srcpkgs/gnome-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index ad2d4b6d03a..22144f3536e 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=3.38.0
-revision=1
+revision=2
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"

From e9de038f10de4d1c4403da01b31ec1c684914fd5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0480/1118] gnome-doc-utils: rebuild for Python 3.9

---
 srcpkgs/gnome-doc-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index c95e75921ef..f2dbf6db8f4 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt

From 5740eade02c323af2a66759ed3cd1701d6a1df5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0481/1118] gnome-music: rebuild for Python 3.9

---
 srcpkgs/gnome-music/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 85a7561059e..33eb2f04a23 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-music'
 pkgname=gnome-music
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"

From 38d2875b580be291841969195317cf3feda006cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:01 -0400
Subject: [PATCH 0482/1118] gnome-passbook: rebuild for Python 3.9

---
 srcpkgs/gnome-passbook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 89047338503..4d3869cdd4e 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-passbook'
 pkgname=gnome-passbook
 version=0.1
-revision=2
+revision=3
 _release_hash=0a227cfdf706f4bfcc0b782026f1aeb2
 wrksrc="passbook-${version}"
 build_style=meson

From 75d6f7fe23657d245409c72ed58241f5d68668a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0483/1118] gns3-server: rebuild for Python 3.9

---
 srcpkgs/gns3-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index e9e672eae64..e4eeb2de3af 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.10
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl

From d0ffa1897293ed885ec4abdf56b351a305a8577b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0484/1118] gnucash: rebuild for Python 3.9

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 83ac8edeb30..658d33b202e 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.2
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"

From cdf365a749b30ebdd43d2c187300d37d52ea4619 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0485/1118] gnuradio-nrsc5: rebuild for Python 3.9

---
 srcpkgs/gnuradio-nrsc5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index 3adb20df64a..56f984f7bd3 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-nrsc5'
 pkgname=gnuradio-nrsc5
 version=1.0.0
-revision=3
+revision=4
 wrksrc="gr-nrsc5-${version}"
 build_style=cmake
 hostmakedepends="git automake libtool pkg-config gnuradio swig"

From a09153169f07cf84d3a9dddf83ad0811f76a0cd0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0486/1118] gnuradio-osmosdr: rebuild for Python 3.9

---
 srcpkgs/gnuradio-osmosdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index 17e72935af8..7a3b2026035 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-osmosdr'
 pkgname=gnuradio-osmosdr
 version=0.2.0
-revision=1
+revision=2
 wrksrc="gr-osmosdr-${version}"
 build_style=cmake
 hostmakedepends="pkg-config swig"

From 7c017d2bbb5db3320418b87967fbc17b006adee3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0487/1118] gnuradio-rds: rebuild for Python 3.9

---
 srcpkgs/gnuradio-rds/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index b5f14681394..4ffd643d272 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio-rds'
 pkgname=gnuradio-rds
 version=3.8.0
-revision=1
+revision=2
 wrksrc="gr-rds-${version}"
 build_style=cmake
 hostmakedepends="pkg-config gnuradio swig"

From 2289fdd5cccc4cb1f10d5e9eb00de141729321c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0488/1118] gom: rebuild for Python 3.9

---
 srcpkgs/gom/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gom/template b/srcpkgs/gom/template
index c948e42f864..b940415f40f 100644
--- a/srcpkgs/gom/template
+++ b/srcpkgs/gom/template
@@ -1,7 +1,7 @@
 # Template file for 'gom'
 pkgname=gom
 version=0.4
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-introspection=$(vopt_if gir true false)

From 2965485f65ef262c0d949ba0ca58b3896012641c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0489/1118] gst1-python3: rebuild for Python 3.9

---
 srcpkgs/gst1-python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index f7e06c33ab9..402018c0476 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
 version=1.16.2
-revision=2
+revision=3
 wrksrc="gst-python-${version}"
 build_style=meson
 pycompile_module="gi/overrides"

From 6646cccc08926f5ebbebcba241be697674903b12 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:02 -0400
Subject: [PATCH 0490/1118] hamlib: rebuild for Python 3.9

---
 srcpkgs/hamlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index d52436c0893..9e0fef9e943 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
 # Template file for 'hamlib'
 pkgname=hamlib
 version=3.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static --with-perl-binding --with-python-binding
  --with-tcl-binding --with-xml-support"

From 098828d2b1a4acbeb88378054ce3910e5a219ebf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0491/1118] hangups: rebuild for Python 3.9

---
 srcpkgs/hangups/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hangups/template b/srcpkgs/hangups/template
index d50c2dcfca8..c5fe0aeed1d 100644
--- a/srcpkgs/hangups/template
+++ b/srcpkgs/hangups/template
@@ -1,7 +1,7 @@
 # Template file for 'hangups'
 pkgname=hangups
 version=0.4.12
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-MechanicalSoup python3-readlike python3-ReParser

From 693069b85ffe5efbb919acda5cb594581ee14cd2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0492/1118] hg-git: rebuild for Python 3.9

---
 srcpkgs/hg-git/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index d88cb0f3bca..ded693e7942 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,7 +1,7 @@
 # Template file for 'hg-git'
 pkgname=hg-git
 version=0.9.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-dulwich mercurial"

From 6843a1fcf3edbcfc72c9d964b040b3c2543490e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0493/1118] hivex: rebuild for Python 3.9

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 1e7b769886e..1deb999991c 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.19
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From 4c0afd2776d3304fb4e624e682619b485e85b8a6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0494/1118] hplip: rebuild for Python 3.9

---
 srcpkgs/hplip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 1cbc1ae151b..527d16a7b5d 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.9
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="

From 0151563b34ef3ea1d6c148f8aae83ce1cc3dbb51 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0495/1118] httpie: rebuild for Python 3.9

---
 srcpkgs/httpie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template
index e82658a74e3..201e2af09b4 100644
--- a/srcpkgs/httpie/template
+++ b/srcpkgs/httpie/template
@@ -1,7 +1,7 @@
 # Template file for 'httpie'
 pkgname=httpie
 version=2.2.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-requests python3-Pygments"

From 064ca4f3d1a91dd08243f42c9e91499b4b388ba7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0496/1118] hyperion: rebuild for Python 3.9

---
 srcpkgs/hyperion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template
index cf5291bf723..2c86a1af38d 100644
--- a/srcpkgs/hyperion/template
+++ b/srcpkgs/hyperion/template
@@ -1,7 +1,7 @@
 # Template file for 'hyperion'
 pkgname=hyperion
 version=1.03.2
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON
  -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON

From e6d2db6677f17258bb83bd134880041e8ff13950 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0497/1118] ibus: rebuild for Python 3.9

---
 srcpkgs/ibus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 1eacddf1737..54bc16abb75 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus'
 pkgname=ibus
 version=1.5.22
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-ui --enable-gtk3 --disable-tests

From c8b628ba63e18f1b900f0f2dd662d55703539dd0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:03 -0400
Subject: [PATCH 0498/1118] iotop: rebuild for Python 3.9

---
 srcpkgs/iotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 1232fa86f8c..84a9f788616 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -1,7 +1,7 @@
 # Template file for 'iotop'
 pkgname=iotop
 version=0.6
-revision=7
+revision=8
 build_style=python3-module
 hostmakedepends="python3"
 depends="${hostmakedepends}"

From b74b36966b563f6e887e77c8a4050266816186c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:04 -0400
Subject: [PATCH 0499/1118] kapidox: rebuild for Python 3.9

---
 srcpkgs/kapidox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index c70a5bd87d5..189ec787ae0 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,7 +1,7 @@
 # Template file for 'kapidox'
 pkgname=kapidox
 version=5.74.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
 makedepends="python3-Jinja2 python3-yaml"

From 5d5730d69276368f247a115f9902ed3459fbe265 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:04 -0400
Subject: [PATCH 0500/1118] kdevelop-python: rebuild for Python 3.9

---
 srcpkgs/kdevelop-python/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index 00da9a63ec7..53c9558a9d8 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -1,7 +1,7 @@
 # Template file for 'kdevelop-python'
 pkgname=kdevelop-python
 version=5.6.0
-revision=1
+revision=2
 wrksrc="kdev-python-${version}"
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"

From 80774f97c099ab3d7e9c8f08fc593f92326b04ea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:04 -0400
Subject: [PATCH 0501/1118] keystone: rebuild for Python 3.9

---
 srcpkgs/keystone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keystone/template b/srcpkgs/keystone/template
index fd1dd285890..ca75eb074dc 100644
--- a/srcpkgs/keystone/template
+++ b/srcpkgs/keystone/template
@@ -1,7 +1,7 @@
 # Template file for 'keystone'
 pkgname=keystone
 version=0.9.2
-revision=1
+revision=2
 build_style=cmake
 configure_args='-DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD=all'
 hostmakedepends="python3-setuptools"

From d63216659d8381902ac0cbc0aa4739900015986e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:04 -0400
Subject: [PATCH 0502/1118] kicad: rebuild for Python 3.9

---
 srcpkgs/kicad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 07cd9220f13..002410f7cb6 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
 # Template file for 'kicad'
 pkgname=kicad
 version=5.1.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
  -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON

From 042d623d077dec2e06fccad88abfa5d9cdef913e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:04 -0400
Subject: [PATCH 0503/1118] kig: rebuild for Python 3.9

---
 .../0001-fix-boost-python-bindung-with-boost-1.67.patch       | 4 ++--
 srcpkgs/kig/template                                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
index 851ed6e439c..fe54f162f63 100644
--- a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
+++ b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
@@ -30,12 +30,12 @@ index 229d2723..f0138bf4 100644
  
 -find_package(BoostPython)
 +find_package(Boost)
-+find_package(PythonLibs 3.8)
++find_package(PythonLibs 3.9)
 +
 +if(Boost_FOUND AND PYTHONLIBS_FOUND)
 +  if(${Boost_VERSION} GREATER 106699)
 +    message("Searching for python boost")
-+    find_package(Boost COMPONENTS python38 REQUIRED)
++    find_package(Boost COMPONENTS python39 REQUIRED)
 +    set(Boost_PYTHON_LIBRARY ${Boost_PYTHON38_LIBRARY})
 +  else()
 +    find_package(Boost COMPONENTS python)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index c03c7391ef3..f493b1d7087 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
 # Template file for 'kig'
 pkgname=kig
 version=20.08.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
  pkg-config qt5-host-tools qt5-qmake"

From b1b6d5257e9d1a73b528ffdb53b85ff07780c748 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:04 -0400
Subject: [PATCH 0504/1118] kitty: rebuild for Python 3.9

---
 srcpkgs/kitty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 4828b0626d6..73a915e6fd6 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
 # Template file for 'kitty'
 pkgname=kitty
 version=0.19.0
-revision=1
+revision=2
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="ncurses pkg-config python3 wayland-devel wayland-protocols"
 makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel

From 7426999b6ca09bbca024f10ac6e32d383697a9df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:04 -0400
Subject: [PATCH 0505/1118] krita: rebuild for Python 3.9

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index ec4a1dfe8ca..6d3a55e2912 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=4.3.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From a3ab50a41d527e5fe343300ba21fe21fccdf2ed5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0506/1118] lfm: rebuild for Python 3.9

---
 srcpkgs/lfm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lfm/template b/srcpkgs/lfm/template
index 0b526560f94..7d909bf8491 100644
--- a/srcpkgs/lfm/template
+++ b/srcpkgs/lfm/template
@@ -1,7 +1,7 @@
 # Template file for 'lfm'
 pkgname=lfm
 version=3.1
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"

From 7f6062dc142459b675e873f54063f67b7efd686f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0507/1118] libArcus: rebuild for Python 3.9

---
 srcpkgs/libArcus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 1dac05f1def..0e41a366254 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
 version=4.7.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"

From cd2bef5838d153d699ebafe1ca541d4c3547b730 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0508/1118] libSavitar: rebuild for Python 3.9

---
 srcpkgs/libSavitar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 27485554d69..b033f1bbe33 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
 version=4.7.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"

From eb8cee4c9b698e955d617fbdbb85fcc09a84e13a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0509/1118] libaccounts-glib: rebuild for Python 3.9

---
 srcpkgs/libaccounts-glib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index 2433b073e5c..465a3f96f50 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libaccounts-glib'
 pkgname=libaccounts-glib
 version=1.24
-revision=3
+revision=4
 wrksrc="${pkgname}-VERSION_${version}-8948717702424ce15f4e23e5db2c8ce0799ec120"
 build_style=meson
 build_helper="gir"

From 8357a9bf1aed0883570fa0aa6ecf10783c2c36f7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0510/1118] libblockdev: rebuild for Python 3.9

---
 srcpkgs/libblockdev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template
index 01697e4500b..93fea3bec4a 100644
--- a/srcpkgs/libblockdev/template
+++ b/srcpkgs/libblockdev/template
@@ -1,7 +1,7 @@
 # Template file for 'libblockdev'
 pkgname=libblockdev
 version=2.24
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="cryptsetup-devel device-mapper-devel dmraid-devel libbytesize-devel

From 42462d4e731bc5dd3d11b8ba2b67bce0d352019a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0511/1118] libbytesize: rebuild for Python 3.9

---
 srcpkgs/libbytesize/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 87b1a5ae016..ce35ad28fa2 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,7 +1,7 @@
 # Template file for 'libbytesize'
 pkgname=libbytesize
 version=2.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gettext python3"
 makedepends="mpfr-devel pcre2-devel"

From f9343bc34fb4a159f748ed3e9c32aafe00082b43 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0512/1118] libcap-ng: rebuild for Python 3.9

---
 srcpkgs/libcap-ng/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index b8649d6ed09..96f304d909a 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
 version=0.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-python --without-python3"
 short_desc="Alternate POSIX capabilities library"

From 4415a95a134ad71b1769d419b00ece390fd428a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:05 -0400
Subject: [PATCH 0513/1118] libcec: rebuild for Python 3.9

---
 srcpkgs/libcec/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index 13f44a65b84..5136e30e713 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -1,7 +1,7 @@
 # Template file for 'libcec'
 pkgname=libcec
 version=4.0.4
-revision=6
+revision=7
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 configure_args="Python_ADDITIONAL_VERSIONS=${py3_ver}"

From e5bd344aa59407715180a3755a77fa8976eee463 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0514/1118] libffado: rebuild for Python 3.9

---
 srcpkgs/libffado/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template
index e3bf2544ceb..2783042b492 100644
--- a/srcpkgs/libffado/template
+++ b/srcpkgs/libffado/template
@@ -1,7 +1,7 @@
 # Template file for 'libffado'
 pkgname=libffado
 version=2.4.4
-revision=1
+revision=2
 build_style=scons
 make_build_args="PREFIX=/usr MANDIR=/usr/share/man
  UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0

From 8e55af4095bd4a1fc83c82c795a128252fcf4e35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0515/1118] libgit2-glib: rebuild for Python 3.9

---
 srcpkgs/libgit2-glib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index f94d7e07d8c..00e6439339b 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'libgit2-glib'
 pkgname=libgit2-glib
 version=0.99.0.1
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)

From a402ab17b5c5d265f9d0e6870c24e2f446829507 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0516/1118] libimobiledevice: rebuild for Python 3.9

---
 srcpkgs/libimobiledevice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 322c2665c37..4e99e7a9cd9 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,7 +1,7 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.2.0
-revision=16
+revision=17
 build_style=gnu-configure
 hostmakedepends="automake libtool pkgconf python3-Cython"
 makedepends="python3-devel libglib-devel libressl-devel libusb-devel

From 16311ea54f1e43d06b9208d894240b0292edba3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0517/1118] libixion: rebuild for Python 3.9

---
 srcpkgs/libixion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 316e90ea740..bf76740007b 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
 # Template file for 'libixion'
 pkgname=libixion
 version=0.15.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel mdds python3-devel spdlog"

From 6e159ac356b8143a05a86c5b589c817e539b14e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0518/1118] liblouis: rebuild for Python 3.9

---
 srcpkgs/liblouis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblouis/template b/srcpkgs/liblouis/template
index 84f590c9f7e..303cb4f2026 100644
--- a/srcpkgs/liblouis/template
+++ b/srcpkgs/liblouis/template
@@ -1,7 +1,7 @@
 # Template file for 'liblouis'
 pkgname=liblouis
 version=3.13.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ucs4"
 pycompile_module="louis"

From dbc3da286e9f72a39b069dee6584c8ffd1a086a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0519/1118] libopenshot: rebuild for Python 3.9

---
 srcpkgs/libopenshot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 57b3edcf7e3..2fdf4a00dc1 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,7 +1,7 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.2.5
-revision=1
+revision=2
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1

From d6e35145b5b19902014831c36ec6ee040ffdc59b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0520/1118] liborcus: rebuild for Python 3.9

---
 srcpkgs/liborcus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index 11fe4ea1995..df66c07d53d 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
 # Template file for 'liborcus'
 pkgname=liborcus
 version=0.15.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3"
 makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"

From 2f2377bc3ca06ed3502332569ad093b54065e1cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:06 -0400
Subject: [PATCH 0521/1118] libpeas: rebuild for Python 3.9

---
 srcpkgs/libpeas/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index 444bea02587..be9de4fd4c6 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
 version=1.26.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"

From 283bb1416eee507404badfa43aefffd4c9c8145d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0522/1118] libpwquality: rebuild for Python 3.9

---
 srcpkgs/libpwquality/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index 2cddf2fc750..df964fc63f4 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -1,7 +1,7 @@
 # Template file for 'libpwquality'
 pkgname=libpwquality
 version=1.4.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security"
 hostmakedepends="libtool automake gettext-devel python3-devel"

From 1056aa3c70cd42ae7ae3bdfeb863d18c07c3b57f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0523/1118] libreoffice: rebuild for Python 3.9

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f418e710848..ce261fc0077 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.0.1.2
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 62813ea78152d6e7c5c6b83593de28de002b7484 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0524/1118] libsigrokdecode: rebuild for Python 3.9

---
 srcpkgs/libsigrokdecode/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template
index 48d01d94cc4..d4f4ec15339 100644
--- a/srcpkgs/libsigrokdecode/template
+++ b/srcpkgs/libsigrokdecode/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrokdecode'
 pkgname=libsigrokdecode
 version=0.5.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="glib-devel python3-devel"

From c5df245dec29f34233b6683e2091f1f2fb105c9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0525/1118] libsmbios: rebuild for Python 3.9

---
 srcpkgs/libsmbios/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template
index 8b500a7a9f2..99843728850 100644
--- a/srcpkgs/libsmbios/template
+++ b/srcpkgs/libsmbios/template
@@ -1,7 +1,7 @@
 # Template file for 'libsmbios'
 pkgname=libsmbios
 version=2.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-static"
 hostmakedepends="automake doxygen gettext gettext-devel help2man libtool pkg-config"

From 9d27bcb9dadfe72bff258e3e15e605f19155964e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0526/1118] libtorrent-rasterbar: rebuild for Python 3.9

---
 srcpkgs/libtorrent-rasterbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 2a67bfa59fc..913b14a6558 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -3,7 +3,7 @@
 pkgname=libtorrent-rasterbar
 reverts="1.2.9_1"
 version=1.2.7
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-examples --enable-python-binding
  --with-boost=${XBPS_CROSS_BASE}/usr

From 806e6c5b1c33ecb32ee691dd776cb9784c551fd9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0527/1118] libvirt-python3: rebuild for Python 3.9

---
 srcpkgs/libvirt-python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 27137c42529..5e1f136640e 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
 version=6.6.0
-revision=1
+revision=2
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel"

From ab991c44d23a222d64011535761821c8918d215d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0528/1118] libvoikko: rebuild for Python 3.9

---
 srcpkgs/libvoikko/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvoikko/template b/srcpkgs/libvoikko/template
index 18b5d846022..79a6956a536 100644
--- a/srcpkgs/libvoikko/template
+++ b/srcpkgs/libvoikko/template
@@ -1,7 +1,7 @@
 # Template file for 'libvoikko'
 pkgname=libvoikko
 version=4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-hfst=false --with-dictionary-path=/usr/share/voikko"
 pycompile_module="libvoikko.py"

From 848971c410610c62a04c045e6dd6de76ed86fa05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:07 -0400
Subject: [PATCH 0529/1118] libxml2-python: rebuild for Python 3.9

---
 .../libxml2-python/patches/py39compat.patch   | 68 +++++++++++++++++++
 srcpkgs/libxml2-python/template               |  8 ++-
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libxml2-python/patches/py39compat.patch

diff --git a/srcpkgs/libxml2-python/patches/py39compat.patch b/srcpkgs/libxml2-python/patches/py39compat.patch
new file mode 100644
index 00000000000..c5dbfabbaa4
--- /dev/null
+++ b/srcpkgs/libxml2-python/patches/py39compat.patch
@@ -0,0 +1,68 @@
+--- python/libxml.c.orig	2020-10-07 14:41:45.226029584 -0400
++++ python/libxml.c	2020-10-07 14:42:58.965113111 -0400
+@@ -294,7 +294,7 @@
+ 	lenread = PyBytes_Size(ret);
+ 	data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+-    } else if PyUnicode_Check (ret) {
++    } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+         Py_ssize_t size;
+ 	const char *tmp;
+@@ -359,7 +359,7 @@
+ 	lenread = PyBytes_Size(ret);
+ 	data = PyBytes_AsString(ret);
+ #ifdef PyUnicode_Check
+-    } else if PyUnicode_Check (ret) {
++    } else if (PyUnicode_Check (ret)) {
+ #if PY_VERSION_HEX >= 0x03030000
+         Py_ssize_t size;
+ 	const char *tmp;
+--- python/types.c.orig	2020-10-07 14:41:49.393034304 -0400
++++ python/types.c	2020-10-07 14:42:23.496072934 -0400
+@@ -602,16 +602,16 @@
+     if (obj == NULL) {
+         return (NULL);
+     }
+-    if PyFloat_Check (obj) {
++    if (PyFloat_Check (obj)) {
+         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));
+-    } else if PyLong_Check(obj) {
++    } else if (PyLong_Check(obj)) {
+ #ifdef PyLong_AS_LONG
+         ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));
+ #else
+         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));
+ #endif
+ #ifdef PyBool_Check
+-    } else if PyBool_Check (obj) {
++    } else if (PyBool_Check (obj)) {
+ 
+         if (obj == Py_True) {
+           ret = xmlXPathNewBoolean(1);
+@@ -620,14 +620,14 @@
+           ret = xmlXPathNewBoolean(0);
+         }
+ #endif
+-    } else if PyBytes_Check (obj) {
++    } else if (PyBytes_Check (obj)) {
+         xmlChar *str;
+ 
+         str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),
+                          PyBytes_GET_SIZE(obj));
+         ret = xmlXPathWrapString(str);
+ #ifdef PyUnicode_Check
+-    } else if PyUnicode_Check (obj) {
++    } else if (PyUnicode_Check (obj)) {
+ #if PY_VERSION_HEX >= 0x03030000
+         xmlChar *str;
+ 	const char *tmp;
+@@ -650,7 +650,7 @@
+ 	ret = xmlXPathWrapString(str);
+ #endif
+ #endif
+-    } else if PyList_Check (obj) {
++    } else if (PyList_Check (obj)) {
+         int i;
+         PyObject *node;
+         xmlNodePtr cur;
diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template
index dbd701f1fe4..4208519dac3 100644
--- a/srcpkgs/libxml2-python/template
+++ b/srcpkgs/libxml2-python/template
@@ -1,7 +1,7 @@
 # Template file for 'libxml2-python'
 pkgname=libxml2-python
 version=2.9.10
-revision=2
+revision=3
 wrksrc="${pkgname%-python}-${version}"
 build_wrksrc=python
 build_style=python-module
@@ -15,8 +15,10 @@ homepage="http://www.xmlsoft.org/"
 distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz"
 checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
 
-pre_build() {
-	sed "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:" -i setup.py
+post_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:"
+	fi
 }
 
 post_install() {

From e9c0d7f70832e1a3d41052b4395f8f29433f08f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:08 -0400
Subject: [PATCH 0530/1118] lightdm-gtk-greeter-settings: rebuild for Python
 3.9

---
 srcpkgs/lightdm-gtk-greeter-settings/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lightdm-gtk-greeter-settings/template b/srcpkgs/lightdm-gtk-greeter-settings/template
index 76a25b91e4c..1f8e22baad1 100644
--- a/srcpkgs/lightdm-gtk-greeter-settings/template
+++ b/srcpkgs/lightdm-gtk-greeter-settings/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter-settings'
 pkgname=lightdm-gtk-greeter-settings
 version=1.2.2
-revision=2
+revision=3
 build_style=python3-module
 pycompile_module="lightdm_gtk_greeter_settings"
 hostmakedepends="python3-distutils-extra intltool"

From 5c9afd07e5fbb5db30a9959b2513cc394415c11b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:08 -0400
Subject: [PATCH 0531/1118] linux-tools: rebuild for Python 3.9

---
 srcpkgs/linux-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index ead8123db21..7313e0288bc 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
 version=5.4.42
-revision=1
+revision=2
 wrksrc="linux-${version}"
 build_style=meta
 hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto"

From 6a9fd3e4847791bb700b80984a134dbe26d8f97c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:08 -0400
Subject: [PATCH 0532/1118] lollypop: rebuild for Python 3.9

---
 srcpkgs/lollypop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index bf32c57bf51..fd6675b880e 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,7 +1,7 @@
 # Template file for 'lollypop'
 pkgname=lollypop
 version=1.4.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
 makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel"

From aa4d4c6885505da5767090db71e4f7ce885ba923 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:08 -0400
Subject: [PATCH 0533/1118] luxrays: rebuild for Python 3.9

---
 srcpkgs/luxrays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
index c750c684100..4ed0916d282 100644
--- a/srcpkgs/luxrays/template
+++ b/srcpkgs/luxrays/template
@@ -1,7 +1,7 @@
 # Template file for 'luxrays'
 pkgname=luxrays
 version=3.1
-revision=17
+revision=18
 build_style=cmake
 configure_args="-DLUXRAYS_DISABLE_OPENCL=OFF -DCMAKE_SKIP_RPATH=ON"
 hostmakedepends="flex bison boost-devel"
@@ -12,7 +12,7 @@ short_desc="LuxMark renderer engine"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3"
 homepage="http://www.luxrender.net/wiki/LuxRays"
-distfiles="https://bitbucket.org/luxrender/luxrays/get/luxmark_v${version}.tar.gz"
+distfiles="https://sources.voidlinux.org/${pkgname}-${version}/luxmark_v${version}.tar.gz"
 checksum=f5b67220b72ec261ad51526d5c4550e2f95130565f3aa02a92d40f56593d8064
 
 post_extract() {

From 9f0ccc26716cb4e52b1811c0ec113df3ec8186fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:08 -0400
Subject: [PATCH 0534/1118] mate-menu: rebuild for Python 3.9

---
 srcpkgs/mate-menu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mate-menu/template b/srcpkgs/mate-menu/template
index 37e4ce4bd6d..492e1b84e06 100644
--- a/srcpkgs/mate-menu/template
+++ b/srcpkgs/mate-menu/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-menu'
 pkgname=mate-menu
 version=20.04.3
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-setuptools"
 depends="mate-panel python3-gobject python3-setproctitle python3-xdg python3-xlib"

From 0a8152aaed111bab2b327527bbfd02b114dede50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:08 -0400
Subject: [PATCH 0535/1118] mate-tweak: rebuild for Python 3.9

---
 srcpkgs/mate-tweak/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template
index 43e51a56c2f..68fd00a1519 100644
--- a/srcpkgs/mate-tweak/template
+++ b/srcpkgs/mate-tweak/template
@@ -1,7 +1,7 @@
 # Template file for 'mate-tweak'
 pkgname=mate-tweak
 version=20.04.0
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools"
 depends="mate-panel python3-gobject python3-psutil python3-setproctitle

From 8705ce835826fbcf151409499d42f1df2b63c48b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:08 -0400
Subject: [PATCH 0536/1118] mcg: rebuild for Python 3.9

---
 srcpkgs/mcg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mcg/template b/srcpkgs/mcg/template
index d742c906773..bb7eaab7ac0 100644
--- a/srcpkgs/mcg/template
+++ b/srcpkgs/mcg/template
@@ -1,7 +1,7 @@
 # Template file for 'mcg'
 pkgname=mcg
 version=2.1
-revision=1
+revision=2
 wrksrc=${pkgname}-v${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools glib-devel"

From c2a4ccbddfe9d777ff8b3eedfa82aa7c54bc9ffb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0537/1118] meld: rebuild for Python 3.9

---
 srcpkgs/meld/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index 04fc5f76b60..ea135d7c2de 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,7 +1,7 @@
 # Template file for 'meld'
 pkgname=meld
 version=3.20.2
-revision=2
+revision=3
 build_style=python3-module
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool python3 itstool gtk-update-icon-cache libxml2-python3"

From 0ec22d98aacff2349c422b3d5106fe651ab44896 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0538/1118] mercurial: rebuild for Python 3.9

---
 srcpkgs/mercurial/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index a5d4504f9ec..7be7ed27dfa 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,7 +1,7 @@
 # Template file for 'mercurial'
 pkgname=mercurial
 version=5.5.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel"
 makedepends="python3-devel"

From 2e5d19ebe99f1b8e082e81c8f4488f002f86ee6b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0539/1118] mopidy-multisonic: rebuild for Python 3.9

---
 srcpkgs/mopidy-multisonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-multisonic/template b/srcpkgs/mopidy-multisonic/template
index 1b8b39170ca..6a7ea1033c5 100644
--- a/srcpkgs/mopidy-multisonic/template
+++ b/srcpkgs/mopidy-multisonic/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-multisonic'
 pkgname=mopidy-multisonic
 version=0.4.0
-revision=1
+revision=2
 wrksrc="Mopidy-Multisonic-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2945f5951c3ca2760b4cac24b60e4d3ab157fe7c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0540/1118] mopidy-podcast: rebuild for Python 3.9

---
 srcpkgs/mopidy-podcast/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-podcast/template b/srcpkgs/mopidy-podcast/template
index 3b323781e90..92a2a5f0f0d 100644
--- a/srcpkgs/mopidy-podcast/template
+++ b/srcpkgs/mopidy-podcast/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-podcast'
 pkgname=mopidy-podcast
 version=3.0.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="mopidy python3-cachetools python3-pykka python3-setuptools python3-uritools"

From 05be8d7f02d941ab88dc3926558e142bc8fea1f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0541/1118] mopidy-spotify: rebuild for Python 3.9

---
 srcpkgs/mopidy-spotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mopidy-spotify/template b/srcpkgs/mopidy-spotify/template
index ab90a00bd03..c7c21380c8b 100644
--- a/srcpkgs/mopidy-spotify/template
+++ b/srcpkgs/mopidy-spotify/template
@@ -1,7 +1,7 @@
 # Template file for 'mopidy-spotify'
 pkgname=mopidy-spotify
 version=4.0.1
-revision=1
+revision=2
 wrksrc="Mopidy-Spotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 01b92bf5df1236396f721e352148a5ba23762055 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0542/1118] nautilus-python: rebuild for Python 3.9

---
 srcpkgs/nautilus-python/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
index c3ae842520d..d4d7d72122b 100644
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@@ -1,7 +1,7 @@
 # Template file for 'nautilus-python'
 pkgname=nautilus-python
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-gtk-doc PYTHON=python3"
 hostmakedepends="automake libtool pkg-config which"

From 645432972787ea6dd3c47f2a9abefff5a19f00c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0543/1118] navit: rebuild for Python 3.9

---
 srcpkgs/navit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 3635c66ec49..449ef1ca16d 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
 # Template file for 'navit'
 pkgname=navit
 version=0.5.4
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"

From c7cc316320a4fa853fadf72ade8a32009b910bb6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:09 -0400
Subject: [PATCH 0544/1118] newt: rebuild for Python 3.9

---
 srcpkgs/newt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/newt/template b/srcpkgs/newt/template
index 25ccc946f51..14655c2a10f 100644
--- a/srcpkgs/newt/template
+++ b/srcpkgs/newt/template
@@ -1,7 +1,7 @@
 # Template file for 'newt'
 pkgname=newt
 version=0.52.21
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="python-devel python3-devel"
 makedepends="slang-devel popt-devel python3-devel python-devel"

From c9c39428a63af30409c40263b1560f7225377e1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0545/1118] nftables: rebuild for Python 3.9

---
 srcpkgs/nftables/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template
index ec0c35f87da..9816049a271 100644
--- a/srcpkgs/nftables/template
+++ b/srcpkgs/nftables/template
@@ -1,7 +1,7 @@
 # Template file for 'nftables'
 pkgname=nftables
 version=0.9.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3"
 hostmakedepends="python3 asciidoc docbook2x flex pkg-config"

From 841ee9123e8f0ddbb9b95b6a5e84b0e8eb8ed500 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0546/1118] notmuch: rebuild for Python 3.9

---
 srcpkgs/notmuch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 09ef2accf2d..d9eef47d0b0 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
 version=0.31
-revision=1
+revision=2
 hostmakedepends="perl pkg-config python3-Sphinx python3-devel texinfo"
 makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel
  python3-cffi python3-setuptools gnupg2"

From 54833df52ca67a0eec8dbde8addd647f1aa04369 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0547/1118] obs: rebuild for Python 3.9

---
 srcpkgs/obs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index 098870570d0..ebfea9ae44d 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,7 +1,7 @@
 # Template file for 'obs'
 pkgname=obs
 version=26.0.0
-revision=1
+revision=2
 archs="i686* x86_64* ppc64le*"
 wrksrc="obs-studio-${version}"
 build_style=cmake

From 350c0f639c4d5e97d2b92c9fa886b2e00075a4f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0548/1118] olm-python3: rebuild for Python 3.9

---
 srcpkgs/olm-python3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/olm-python3/template b/srcpkgs/olm-python3/template
index d24edc16937..80c75317452 100644
--- a/srcpkgs/olm-python3/template
+++ b/srcpkgs/olm-python3/template
@@ -1,7 +1,7 @@
 # Template file for 'olm-python3'
 pkgname=olm-python3
 version=3.1.5
-revision=2
+revision=3
 wrksrc="olm-${version}"
 build_wrksrc=python
 build_style=python3-module

From 140a219e12f955eee2f508954d6998e7a70d1331 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0549/1118] onboard: rebuild for Python 3.9

---
 srcpkgs/onboard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template
index 9f5398c48d8..833a136ccb7 100644
--- a/srcpkgs/onboard/template
+++ b/srcpkgs/onboard/template
@@ -1,7 +1,7 @@
 # Template file for 'onboard'
 pkgname=onboard
 version=1.4.1
-revision=6
+revision=7
 build_style=python3-module
 pycompile_module="Onboard"
 patch_args="-Np1"

From 1f9db9ff60ffbc563f4865f5dab1259108ca788f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0550/1118] opencamlib: rebuild for Python 3.9

---
 srcpkgs/opencamlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 03af09f779f..38cf6d7d8eb 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
 # Template file for 'opencamlib'
 pkgname=opencamlib
 version=2019.07
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
 hostmakedepends="python3"

From 1c09bdf2b8a7650f75eff536729efc9c51ffc889 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0551/1118] opencv: rebuild for Python 3.9

---
 srcpkgs/opencv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 648ff3a0c58..13f484f92c4 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv'
 pkgname=opencv
 version=3.4.10
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
  -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON

From 298b4fbb7d31c47d4ba5276bdf8456c98c0d21f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:10 -0400
Subject: [PATCH 0552/1118] opencv4: rebuild for Python 3.9

---
 srcpkgs/opencv4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template
index cdeffdf991e..5f029bff809 100644
--- a/srcpkgs/opencv4/template
+++ b/srcpkgs/opencv4/template
@@ -1,7 +1,7 @@
 # Template file for 'opencv4'
 pkgname=opencv4
 version=4.3.0
-revision=3
+revision=4
 wrksrc=opencv-${version}
 build_style=cmake
 configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON

From 008707b03a8a1d3f69bd0924493135e7b43ba594 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0553/1118] openrazer-meta: rebuild for Python 3.9

---
 srcpkgs/openrazer-meta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 2ca645a075e..48d06b15dff 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,7 +1,7 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
 version=2.8.0
-revision=1
+revision=2
 wrksrc="openrazer-${version}"
 build_style=gnu-makefile
 make_install_target="setup_dkms udev_install daemon_install xdg_install

From 4fad5db2a85e11fedd0d3011b3abb3888a8f51a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0554/1118] openshot: rebuild for Python 3.9

---
 srcpkgs/openshot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openshot/template b/srcpkgs/openshot/template
index 3ee73061f83..e410aa1eaa4 100644
--- a/srcpkgs/openshot/template
+++ b/srcpkgs/openshot/template
@@ -1,7 +1,7 @@
 # Template file for 'openshot'
 pkgname=openshot
 version=2.5.1
-revision=1
+revision=2
 archs="i686 x86_64 ppc64le"
 wrksrc="${pkgname}-qt-${version}"
 build_style=python3-module

From f0b51d35436d14ef9d0175a4d071294fd40fa8fb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0555/1118] orca: rebuild for Python 3.9

---
 srcpkgs/orca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index 38e92346b86..a615c6445eb 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
 # Template file for 'orca'
 pkgname=orca
 version=3.38.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool itstool pkg-config"
 makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"

From 062f328a7ebc4e54191683d65f23c29d2d600a41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0556/1118] pantalaimon: rebuild for Python 3.9

---
 srcpkgs/pantalaimon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template
index 1dad3347bed..f26c3c83b06 100644
--- a/srcpkgs/pantalaimon/template
+++ b/srcpkgs/pantalaimon/template
@@ -1,7 +1,7 @@
 # Template file for 'pantalaimon'
 pkgname=pantalaimon
 version=0.7.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-attrs python3-aiohttp python3-appdirs python3-click

From 73ba5840794a006a0e5d0d2f029998ca602b1348 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0557/1118] papis: rebuild for Python 3.9

---
 srcpkgs/papis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template
index e3788af2a75..e34c07e2ab1 100644
--- a/srcpkgs/papis/template
+++ b/srcpkgs/papis/template
@@ -1,7 +1,7 @@
 # Template file for 'papis'
 pkgname=papis
 version=0.10
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-yaml python3-chardet python3-BeautifulSoup4

From 1dfe7011fff8a761412ec9969f91f7735dcbc7bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0558/1118] paraview: rebuild for Python 3.9

---
 srcpkgs/paraview/patches/cmake-py39.patch | 11 ++++++++++
 srcpkgs/paraview/template                 | 25 +++--------------------
 2 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 srcpkgs/paraview/patches/cmake-py39.patch

diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch
new file mode 100644
index 00000000000..b309d596c81
--- /dev/null
+++ b/srcpkgs/paraview/patches/cmake-py39.patch
@@ -0,0 +1,11 @@
+--- VTK/CMake/patches/99/FindPython/Support.cmake.orig	2020-10-08 00:54:51.788984364 -0400
++++ VTK/CMake/patches/99/FindPython/Support.cmake	2020-10-08 00:54:56.640977251 -0400
+@@ -46,7 +46,7 @@
+   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
+ endif()
+ if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
+-  set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++  set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
+   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+ else()
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index d5155e81827..20a7f558967 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
 # Template file for 'paraview'
 pkgname=paraview
 version=5.8.1
-revision=2
+revision=3
 wrksrc=ParaView-v${version}
 build_style=cmake
 configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
@@ -16,7 +16,7 @@ configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
  -DVTKm_ENABLE_RENDERING=ON
  -DVTKm_USE_DOUBLE_PRECISION=ON"
 #make_build_args="VERBOSE=1"
-hostmakedepends="pkg-config which"
+hostmakedepends="pkg-config which python3"
 # TODO: find some way of making this work with system vtk
 makedepends="MesaLib-devel libfreeglut-devel glu-devel libXt-devel
  openmpi-devel qt5-devel qt5-x11extras-devel qt5-tools-devel qt5-plugin-mysql
@@ -43,7 +43,7 @@ export QT_SELECT="5"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
-	LDFLAGS="-lexecinfo"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
 fi
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -70,25 +70,6 @@ pre_configure() {
 	fi
 }
 
-_add_execinfo() {
-	# contents of link.txt files need to be in a single line
-	local content="$(cat $1) -lexecinfo "
-	echo "$content" > $1
-}
-
-pre_build() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		# TODO: -lexecinfo in LDFLAGS adds it to the start of the file, so linking still fails.
-		# there's probably some configure_arg that actually makes it work cleanly, I hope.
-		# this list of files hasn't been extensively tested. It's possible not all of them are required.
-		_add_execinfo build/VTK/Rendering/LICOpenGL2/CMakeFiles/RenderingLICOpenGL2.dir/link.txt
-		_add_execinfo build/VTK/Rendering/OpenGL2/CMakeFiles/vtkProbeOpenGLVersion.dir/link.txt
-		_add_execinfo build/VTK/ThirdParty/loguru/vtkloguru/CMakeFiles/loguru.dir/link.txt
-		_add_execinfo build/VTK/Common/Core/CMakeFiles/CommonCore.dir/link.txt
-		_add_execinfo build/VTKExtensions/Core/CMakeFiles/VTKExtensionsCore.dir/link.txt
-	fi
-}
-
 post_install() {
 	vlicense Copyright.txt
 }

From 978359c2b0f0f145bb53ab04d5589b1c4d60f12e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0559/1118] pass-git-helper: rebuild for Python 3.9

---
 srcpkgs/pass-git-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index 1676a920ecc..e891b69c183 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'pass-git-helper'
 pkgname=pass-git-helper
 version=1.1.0
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pass python3-xdg"

From 7f5603032a6f3ad96d60c916c565a95bb4cbb62d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:11 -0400
Subject: [PATCH 0560/1118] platformio: rebuild for Python 3.9

---
 srcpkgs/platformio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index e5189af746d..058ca2741dd 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,7 +1,7 @@
 # Template file for 'platformio'
 pkgname=platformio
 version=4.3.4
-revision=2
+revision=3
 wrksrc="platformio-core-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b2245f653b3c34a403c12ec39db555893b393979 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0561/1118] pmbootstrap: rebuild for Python 3.9

---
 srcpkgs/pmbootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index d625330cf5a..ddc680804f2 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
 version=1.23.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools coreutils procps-ng libressl git"

From d774e9f4ddbab42994a80d222ba92e10fcc8f463 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0562/1118] poezio: rebuild for Python 3.9

---
 srcpkgs/poezio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poezio/template b/srcpkgs/poezio/template
index a1f8f955c0d..9392f6d8e2b 100644
--- a/srcpkgs/poezio/template
+++ b/srcpkgs/poezio/template
@@ -1,7 +1,7 @@
 # Template file for 'poezio'
 pkgname=poezio
 version=0.13.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"
 makedepends="python3-devel"

From a321542f430470fb387aedac4358fd4fce326537 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0563/1118] portage: rebuild for Python 3.9

---
 srcpkgs/portage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index c63b59ccef7..0698453b78f 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,7 +1,7 @@
 # Template file for 'portage'
 pkgname=portage
 version=3.0.8
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=python3-module
 make_install_args="--sbindir=/usr/bin"

From 37dc6c507af4875cf143ed85580c9542f8aeeee4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0564/1118] postgresql12: rebuild for Python 3.9

---
 srcpkgs/postgresql12/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index eb0cd21594d..8dd1adbefbf 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql12'
 pkgname=postgresql12
 version=12.4
-revision=3
+revision=4
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world

From 689d9ba923e0a508693dfdef619235cb64c34bd5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0565/1118] postgresql13: rebuild for Python 3.9

---
 srcpkgs/postgresql13/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 449a06a0fe3..588b497400f 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql13'
 pkgname=postgresql13
 version=13.0
-revision=1
+revision=2
 wrksrc="postgresql-${version}"
 build_style=gnu-configure
 make_build_target=world

From 859347fa523a082ba601772527299d8e2baf2326 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0566/1118] profanity: rebuild for Python 3.9

---
 srcpkgs/profanity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index ff808ba106e..88c75ab5f2f 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -1,7 +1,7 @@
 # Template file for 'profanity'
 pkgname=profanity
 version=0.9.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable notify notifications) $(vopt_enable otr)
  $(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins)

From c03eeaf5a97b2bde4b96bee838ce316310fa33b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0567/1118] protontricks: rebuild for Python 3.9

---
 srcpkgs/protontricks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 87789a819c9..df63cd27c63 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,7 +1,7 @@
 # Template file for 'protontricks'
 pkgname=protontricks
 version=1.4.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-setuptools"

From f755fb6ebe48a5b8775bc2e80f0a445ce485d1cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:12 -0400
Subject: [PATCH 0568/1118] pulseaudio-equalizer-ladspa: rebuild for Python 3.9

---
 srcpkgs/pulseaudio-equalizer-ladspa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pulseaudio-equalizer-ladspa/template b/srcpkgs/pulseaudio-equalizer-ladspa/template
index 10198de2c08..01a5416901f 100644
--- a/srcpkgs/pulseaudio-equalizer-ladspa/template
+++ b/srcpkgs/pulseaudio-equalizer-ladspa/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio-equalizer-ladspa'
 pkgname=pulseaudio-equalizer-ladspa
 version=3.0.2
-revision=2
+revision=3
 wrksrc="equalizer-${version}"
 build_style=meson
 pycompile_module="pulseeq"

From 89f646a57e7262326009f4bda174653ccdc9ff69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:13 -0400
Subject: [PATCH 0569/1118] pulseeffects: rebuild for Python 3.9

---
 srcpkgs/pulseeffects/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pulseeffects/template b/srcpkgs/pulseeffects/template
index d7f065e53e6..e4d25c7ecb2 100644
--- a/srcpkgs/pulseeffects/template
+++ b/srcpkgs/pulseeffects/template
@@ -2,7 +2,7 @@
 pkgname=pulseeffects
 reverts="4.3.4_1"
 version=3.2.3
-revision=5
+revision=6
 build_style=meson
 pycompile_module="PulseEffects PulseEffectsTest"
 hostmakedepends="pkg-config"

From 34c637771dad9e03bf6351315fe0e8940c1154ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:13 -0400
Subject: [PATCH 0570/1118] py3status: rebuild for Python 3.9

---
 srcpkgs/py3status/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index e363fc53584..9db3993929e 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,7 +1,7 @@
 # Template file for 'py3status'
 pkgname=py3status
 version=3.30
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-pyudev"

From 339dabf39ba81b17f459b1a75234c353b63edf4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:13 -0400
Subject: [PATCH 0571/1118] pylint: rebuild for Python 3.9

---
 srcpkgs/pylint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index c882b1f293a..0ad14768d94 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,7 +1,7 @@
 # Template file for 'pylint'
 pkgname=pylint
 version=2.6.0
-revision=2
+revision=3
 wrksrc="pylint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9dab862f8b92c3792177ef6c45d850ae403d2016 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:13 -0400
Subject: [PATCH 0572/1118] pymol: rebuild for Python 3.9

---
 srcpkgs/pymol/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pymol/template b/srcpkgs/pymol/template
index 12c2d6e5834..dfb9441f22a 100644
--- a/srcpkgs/pymol/template
+++ b/srcpkgs/pymol/template
@@ -1,7 +1,7 @@
 # Template file for 'pymol'
 pkgname=pymol
 version=2.4.0
-revision=1
+revision=2
 wrksrc=${pkgname}-open-source-${version}
 build_style="python3-module"
 build_helper="numpy"

From 3dfe9398c16fe78e7a38d74e984286bdabf4a41f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:13 -0400
Subject: [PATCH 0573/1118] python-Babel: rebuild for Python 3.9

---
 srcpkgs/python-Babel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-Babel/template b/srcpkgs/python-Babel/template
index e64f9976592..615b125364a 100644
--- a/srcpkgs/python-Babel/template
+++ b/srcpkgs/python-Babel/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Babel'
 pkgname=python-Babel
 version=2.8.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From fb6b61328b87bd9100f7390cf8e5ed8c50f9c88a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:13 -0400
Subject: [PATCH 0574/1118] python-Cython: rebuild for Python 3.9

---
 srcpkgs/python-Cython/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 7c478253878..bdcb0c6d80d 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
 version=0.29.21
-revision=1
+revision=2
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From dda46eb4171fa0f59bd5f9fa6f881ea925908334 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:13 -0400
Subject: [PATCH 0575/1118] python-Jinja2: rebuild for Python 3.9

---
 srcpkgs/python-Jinja2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
index a1d57f364fe..c9db333429b 100644
--- a/srcpkgs/python-Jinja2/template
+++ b/srcpkgs/python-Jinja2/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Jinja2'
 pkgname=python-Jinja2
 version=2.11.2
-revision=1
+revision=2
 wrksrc="Jinja2-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From eddafd7a0d60243c9a7e83a0635471246fe88509 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0576/1118] python-M2Crypto: rebuild for Python 3.9

---
 srcpkgs/python-M2Crypto/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 619c49f7df6..7a85be3041a 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,7 +1,7 @@
 # Template file for 'python-M2Crypto'
 pkgname=python-M2Crypto
 version=0.35.2
-revision=4
+revision=5
 wrksrc="M2Crypto-${version}"
 build_style=python-module
 pycompile_module="M2Crypto"

From 583e7d2507b879dc1d30d6aec5f847577452c8fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0577/1118] python-MarkupSafe: rebuild for Python 3.9

---
 srcpkgs/python-MarkupSafe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template
index 010a7d0163c..780a65f9242 100644
--- a/srcpkgs/python-MarkupSafe/template
+++ b/srcpkgs/python-MarkupSafe/template
@@ -1,7 +1,7 @@
 # Template file for 'python-MarkupSafe'
 pkgname=python-MarkupSafe
 version=1.1.1
-revision=5
+revision=6
 wrksrc="MarkupSafe-${version}"
 build_style=python-module
 pycompile_module="markupsafe"

From 1b1406c0a5a8127acf56a9e7e1ab9b9cb82ac671 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0578/1118] python-PyHamcrest: rebuild for Python 3.9

---
 srcpkgs/python-PyHamcrest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
index 204a6a1a95e..ddb560675b3 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python-PyHamcrest/template
@@ -1,7 +1,7 @@
 # Template file for 'python-PyHamcrest'
 pkgname=python-PyHamcrest
 version=1.9.0
-revision=3
+revision=4
 wrksrc="PyHamcrest-${version}"
 build_style=python-module
 pycompile_module="hamcrest"

From edc493e375bf8eb4568ffd9a1a4e4a5df2c74780 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0579/1118] python-Pygments: rebuild for Python 3.9

---
 srcpkgs/python-Pygments/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-Pygments/template b/srcpkgs/python-Pygments/template
index 17f7b6bf5d2..5245394266c 100644
--- a/srcpkgs/python-Pygments/template
+++ b/srcpkgs/python-Pygments/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Pygments'
 pkgname=python-Pygments
 version=2.5.2
-revision=2
+revision=3
 wrksrc="Pygments-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 382761963fb389c36379c8e10cea7a57ad2d5197 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0580/1118] python-SQLAlchemy: rebuild for Python 3.9

---
 srcpkgs/python-SQLAlchemy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
index 27b5d9032b1..b4ff86c2762 100644
--- a/srcpkgs/python-SQLAlchemy/template
+++ b/srcpkgs/python-SQLAlchemy/template
@@ -1,7 +1,7 @@
 # Template file for 'python-SQLAlchemy'
 pkgname=python-SQLAlchemy
 version=1.3.18
-revision=1
+revision=2
 wrksrc="SQLAlchemy-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From b53e92ae9c3ed108ed6fa8bac0614ba5b78ad86f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0581/1118] python-Twisted: rebuild for Python 3.9

---
 srcpkgs/python-Twisted/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-Twisted/template b/srcpkgs/python-Twisted/template
index 65e896f1f2b..5371c036a04 100644
--- a/srcpkgs/python-Twisted/template
+++ b/srcpkgs/python-Twisted/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Twisted'
 pkgname=python-Twisted
 version=20.3.0
-revision=1
+revision=2
 wrksrc="Twisted-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools

From fc915170f06549216ca92ae0511a22f6766a1202 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0582/1118] python-atomicwrites: rebuild for Python 3.9

---
 srcpkgs/python-atomicwrites/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-atomicwrites/template b/srcpkgs/python-atomicwrites/template
index 818d2caf896..e5cbe22980f 100644
--- a/srcpkgs/python-atomicwrites/template
+++ b/srcpkgs/python-atomicwrites/template
@@ -1,7 +1,7 @@
 # Template file for 'python-atomicwrites'
 pkgname=python-atomicwrites
 version=1.3.0
-revision=3
+revision=4
 wrksrc="atomicwrites-${version}"
 build_style=python-module
 pycompile_module="atomicwrites"

From 03cb2426a2ff38d35fddcd5773f745976e70b0cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:14 -0400
Subject: [PATCH 0583/1118] python-attrs: rebuild for Python 3.9

---
 srcpkgs/python-attrs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index a58b18c7b90..0689954434f 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -1,7 +1,7 @@
 # Template file for 'python-attrs'
 pkgname=python-attrs
 version=20.2.0
-revision=1
+revision=2
 wrksrc="attrs-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 46764f1370e1112f141f585e78b75d9dbf81693b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:15 -0400
Subject: [PATCH 0584/1118] python-automat: rebuild for Python 3.9

---
 srcpkgs/python-automat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index 372f26c62a9..74c3ef1cafe 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -1,7 +1,7 @@
 # Template file for 'python-automat'
 pkgname=python-automat
 version=20.2.0
-revision=2
+revision=3
 wrksrc="Automat-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From ba296a607dfa4a52f872ca1c51ebb9f6f362138b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:15 -0400
Subject: [PATCH 0585/1118] python-b2sdk: rebuild for Python 3.9

---
 srcpkgs/python-b2sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index a499face476..6ee518013bc 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -2,7 +2,7 @@
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
 version=1.1.4
-revision=2
+revision=3
 wrksrc="b2sdk-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From de9ed37ad156cf9f4a552e9bb557dc796828b8a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:15 -0400
Subject: [PATCH 0586/1118] python-bcrypt: rebuild for Python 3.9

---
 srcpkgs/python-bcrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-bcrypt/template b/srcpkgs/python-bcrypt/template
index 664b5c9df07..416bd2d281e 100644
--- a/srcpkgs/python-bcrypt/template
+++ b/srcpkgs/python-bcrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'python-bcrypt'
 pkgname=python-bcrypt
 version=3.1.7
-revision=2
+revision=3
 wrksrc="bcrypt-${version}"
 build_style=python-module
 pycompile_module="bcrypt"

From e96531ad09ea2b0eedc33bf885684f54832bd99a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:15 -0400
Subject: [PATCH 0587/1118] python-boto: rebuild for Python 3.9

---
 srcpkgs/python-boto/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-boto/template b/srcpkgs/python-boto/template
index 677b84bdd6f..732c14f8d9e 100644
--- a/srcpkgs/python-boto/template
+++ b/srcpkgs/python-boto/template
@@ -1,7 +1,7 @@
 # Template file for 'python-boto'
 pkgname=python-boto
 version=2.49.0
-revision=3
+revision=4
 wrksrc="boto-${version}"
 build_style=python-module
 pycompile_module="boto"

From b68b7132bcb8bc7e0d90d3061e2fca8a13fe31c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:15 -0400
Subject: [PATCH 0588/1118] python-cffi: rebuild for Python 3.9

---
 srcpkgs/python-cffi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
index cb106575f5f..843d11d2f35 100644
--- a/srcpkgs/python-cffi/template
+++ b/srcpkgs/python-cffi/template
@@ -1,7 +1,7 @@
 # Template file for 'python-cffi'
 pkgname=python-cffi
 version=1.14.3
-revision=1
+revision=2
 wrksrc="cffi-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools libffi-devel"

From a2275dcd6340a28c3b925a304f0d40c6d53845cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:15 -0400
Subject: [PATCH 0589/1118] python-chardet: rebuild for Python 3.9

---
 srcpkgs/python-chardet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-chardet/template b/srcpkgs/python-chardet/template
index 9fb0c4f4dac..18ae457b2a8 100644
--- a/srcpkgs/python-chardet/template
+++ b/srcpkgs/python-chardet/template
@@ -1,7 +1,7 @@
 # Template file for 'python-chardet'
 pkgname=python-chardet
 version=3.0.4
-revision=4
+revision=5
 wrksrc="chardet-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From bf84d47e7fe01db456b8958ba84de043cfa02f23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:15 -0400
Subject: [PATCH 0590/1118] python-configobj: rebuild for Python 3.9

---
 srcpkgs/python-configobj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-configobj/template b/srcpkgs/python-configobj/template
index d292221e887..99d86ab89b8 100644
--- a/srcpkgs/python-configobj/template
+++ b/srcpkgs/python-configobj/template
@@ -1,7 +1,7 @@
 # Template file for 'python-configobj'
 pkgname=python-configobj
 version=5.0.6
-revision=7
+revision=8
 wrksrc="configobj-${version}"
 build_style=python-module
 pycompile_module="_version.py configobj.py validate.py"

From addc3952a893a5e5d3dc5a9035cc7a0586e91de1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0591/1118] python-constantly: rebuild for Python 3.9

---
 srcpkgs/python-constantly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
index e1607c060b1..1686c863022 100644
--- a/srcpkgs/python-constantly/template
+++ b/srcpkgs/python-constantly/template
@@ -1,7 +1,7 @@
 # Template file for 'python-constantly'
 pkgname=python-constantly
 version=15.1.0
-revision=4
+revision=5
 wrksrc="constantly-${version}"
 build_style=python-module
 pycompile_module="constantly"

From a8af98a9f93203f362a1835b5ec13806208bcc24 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0592/1118] python-coverage: rebuild for Python 3.9

---
 srcpkgs/python-coverage/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template
index c151fa762da..332e7baa3b7 100644
--- a/srcpkgs/python-coverage/template
+++ b/srcpkgs/python-coverage/template
@@ -1,7 +1,7 @@
 # Template file for 'python-coverage'
 pkgname=python-coverage
 version=5.0.3
-revision=1
+revision=2
 wrksrc="${pkgname/python-//}-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 40e342658f4914db3f8512504ffa8ffc488ce48f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0593/1118] python-cryptography: rebuild for Python 3.9

---
 srcpkgs/python-cryptography/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index f551f21d4c4..94dc160bda1 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,7 +1,7 @@
 # Template file for 'python-cryptography'
 pkgname=python-cryptography
 version=3.1
-revision=1
+revision=2
 wrksrc="cryptography-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools libressl-devel

From 151eed01d34c3bcc0f8d5a2307662bbaab4e8370 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0594/1118] python-cryptography_vectors: rebuild for Python 3.9

---
 srcpkgs/python-cryptography_vectors/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-cryptography_vectors/template b/srcpkgs/python-cryptography_vectors/template
index e92206cc4d3..94ad54558f4 100644
--- a/srcpkgs/python-cryptography_vectors/template
+++ b/srcpkgs/python-cryptography_vectors/template
@@ -1,7 +1,7 @@
 # Template file for 'python-cryptography_vectors'
 pkgname=python-cryptography_vectors
 version=3.1
-revision=2
+revision=3
 wrksrc="cryptography_vectors-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 97477f0703cc7bd21937091f3df5e91b4f14e2d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0595/1118] python-dateutil: rebuild for Python 3.9

---
 srcpkgs/python-dateutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index e3b8e9e1752..6dc876145df 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -1,7 +1,7 @@
 # Template file for 'python-dateutil'
 pkgname=python-dateutil
 version=2.8.0
-revision=3
+revision=4
 build_style=python-module
 pycompile_module="dateutil"
 hostmakedepends="python-setuptools python3-setuptools"

From 6beb59a81496626b1ff5d89dea0b4da35b4a679d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0596/1118] python-dbus: rebuild for Python 3.9

---
 srcpkgs/python-dbus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 8044bb7df0e..ee6b9ddb79f 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
 version=1.2.16
-revision=1
+revision=2
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config python-devel python3-devel"

From c415d403ebb1a353633e3ec0660ed960c3fbf1ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0597/1118] python-decorator: rebuild for Python 3.9

---
 srcpkgs/python-decorator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-decorator/template b/srcpkgs/python-decorator/template
index 5cad98c511d..66042864eab 100644
--- a/srcpkgs/python-decorator/template
+++ b/srcpkgs/python-decorator/template
@@ -1,7 +1,7 @@
 # Template file for 'python-decorator'
 pkgname=python-decorator
 version=4.4.0
-revision=3
+revision=4
 wrksrc="decorator-${version}"
 build_style=python-module
 pycompile_module="decorator.py"

From e5e05fc8ee617e9e7064360f3ecefffcd0e76fc0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:16 -0400
Subject: [PATCH 0598/1118] python-distutils-extra: rebuild for Python 3.9

---
 srcpkgs/python-distutils-extra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-distutils-extra/template b/srcpkgs/python-distutils-extra/template
index 4b0ff720611..61648d80ced 100644
--- a/srcpkgs/python-distutils-extra/template
+++ b/srcpkgs/python-distutils-extra/template
@@ -1,7 +1,7 @@
 # Template file for 'python-distutils-extra'
 pkgname=python-distutils-extra
 version=2.39
-revision=5
+revision=6
 build_style=python-module
 pycompile_module="DistUtilsExtra"
 hostmakedepends="intltool python-setuptools python3-setuptools"

From e330b2a7348eb463647cd29e236383a10b490d25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:17 -0400
Subject: [PATCH 0599/1118] python-docutils: rebuild for Python 3.9

---
 srcpkgs/python-docutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
index 053f0f5be98..02232f31a26 100644
--- a/srcpkgs/python-docutils/template
+++ b/srcpkgs/python-docutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python-docutils'
 pkgname=python-docutils
 version=0.16
-revision=2
+revision=3
 wrksrc="docutils-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From c4a3788094e16a5736e4d3c9fd947a8e2d3d2f2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:17 -0400
Subject: [PATCH 0600/1118] python-evdev: rebuild for Python 3.9

---
 srcpkgs/python-evdev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-evdev/template b/srcpkgs/python-evdev/template
index 11770a1ad4b..ded33276800 100644
--- a/srcpkgs/python-evdev/template
+++ b/srcpkgs/python-evdev/template
@@ -1,7 +1,7 @@
 # Template file for 'python-evdev'
 pkgname=python-evdev
 version=1.2.0
-revision=3
+revision=4
 build_style=python-module
 pycompile_module="evdev"
 hostmakedepends="python-setuptools python3-setuptools"

From 71f762d8fc31b709583931ac206e7eca6b0e43d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:17 -0400
Subject: [PATCH 0601/1118] python-feedparser: rebuild for Python 3.9

---
 srcpkgs/python-feedparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-feedparser/template b/srcpkgs/python-feedparser/template
index 64ba314b0b8..993e350e560 100644
--- a/srcpkgs/python-feedparser/template
+++ b/srcpkgs/python-feedparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python-feedparser'
 pkgname=python-feedparser
 version=5.2.1
-revision=7
+revision=8
 wrksrc="feedparser-${version}"
 build_style=python-module
 pycompile_module="feedparser.py"

From f80d602961828d1753383943b4f7fd63c4844a01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:17 -0400
Subject: [PATCH 0602/1118] python-gntp: rebuild for Python 3.9

---
 srcpkgs/python-gntp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-gntp/template b/srcpkgs/python-gntp/template
index b7a172f348a..516246a110b 100644
--- a/srcpkgs/python-gntp/template
+++ b/srcpkgs/python-gntp/template
@@ -1,7 +1,7 @@
 # Template file for 'python-gntp'
 pkgname=python-gntp
 version=1.0.3
-revision=6
+revision=7
 wrksrc="gntp-${version}"
 build_style=python-module
 pycompile_module="gntp"

From 494f323abadcf85fa226cec1439f1b84663c917a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:17 -0400
Subject: [PATCH 0603/1118] python-hyperlink: rebuild for Python 3.9

---
 srcpkgs/python-hyperlink/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index 933a3540c20..eb2799306a5 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -1,7 +1,7 @@
 # Template file for 'python-hyperlink'
 pkgname=python-hyperlink
 version=19.0.0
-revision=3
+revision=4
 wrksrc="hyperlink-${version}"
 build_style=python-module
 pycompile_module="hyperlink"

From 4245e79c364fbe387b435661234af3a80e8b12ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:17 -0400
Subject: [PATCH 0604/1118] python-hypothesis: rebuild for Python 3.9

---
 srcpkgs/python-hypothesis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-hypothesis/template b/srcpkgs/python-hypothesis/template
index 4c8c0291fc6..f5d24ead724 100644
--- a/srcpkgs/python-hypothesis/template
+++ b/srcpkgs/python-hypothesis/template
@@ -1,7 +1,7 @@
 # Template file for 'python-hypothesis'
 pkgname=python-hypothesis
 version=4.38.2
-revision=3
+revision=4
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
 build_style=python-module

From 784a0af14c653066b5c551d1b97e073a91988abc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:17 -0400
Subject: [PATCH 0605/1118] python-idna: rebuild for Python 3.9

---
 srcpkgs/python-idna/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-idna/template b/srcpkgs/python-idna/template
index 1a097884cbe..762e520aa7f 100644
--- a/srcpkgs/python-idna/template
+++ b/srcpkgs/python-idna/template
@@ -1,7 +1,7 @@
 # Template file for 'python-idna'
 pkgname=python-idna
 version=2.9
-revision=2
+revision=3
 wrksrc="idna-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 60603f82e5aee0b7625f1643f0831b1543faa170 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0606/1118] python-incremental: rebuild for Python 3.9

---
 srcpkgs/python-incremental/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
index 1a8b7f8d206..b5248b29eb3 100644
--- a/srcpkgs/python-incremental/template
+++ b/srcpkgs/python-incremental/template
@@ -1,7 +1,7 @@
 # Template file for 'python-incremental'
 pkgname=python-incremental
 version=17.5.0
-revision=4
+revision=5
 wrksrc="incremental-${version}"
 build_style=python-module
 pycompile_module="incremental"

From 60e64eee0d3548c62d7a96438f8acdf3687bae98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0607/1118] python-iso-8601: rebuild for Python 3.9

---
 srcpkgs/python-iso-8601/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-iso-8601/template b/srcpkgs/python-iso-8601/template
index b094c82ab31..114fd22f7d9 100644
--- a/srcpkgs/python-iso-8601/template
+++ b/srcpkgs/python-iso-8601/template
@@ -1,7 +1,7 @@
 # Template file for 'python-iso-8601'
 pkgname=python-iso-8601
 version=0.3.0
-revision=3
+revision=4
 wrksrc="iso-8601-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From ac940e7158589daf846b83f52f3ef462e1cc953f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0608/1118] python-isodate: rebuild for Python 3.9

---
 srcpkgs/python-isodate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-isodate/template b/srcpkgs/python-isodate/template
index b2f65659bad..9238842e196 100644
--- a/srcpkgs/python-isodate/template
+++ b/srcpkgs/python-isodate/template
@@ -1,7 +1,7 @@
 # Template file for 'python-isodate'
 pkgname=python-isodate
 version=0.6.0
-revision=3
+revision=4
 wrksrc="isodate-${version}"
 build_style=python-module
 pycompile_module="isodate"

From e9e66510a09c94e3082e3715b0adbccaaf400deb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0609/1118] python-lockfile: rebuild for Python 3.9

---
 srcpkgs/python-lockfile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-lockfile/template b/srcpkgs/python-lockfile/template
index 3b9cc302904..8b01b42bb95 100644
--- a/srcpkgs/python-lockfile/template
+++ b/srcpkgs/python-lockfile/template
@@ -1,7 +1,7 @@
 # Template file for 'python-lockfile'
 pkgname=python-lockfile
 version=0.12.2
-revision=5
+revision=6
 wrksrc="lockfile-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr"

From c5faf04a6b4dbac73e4d4814fdc977fa4f5e8eaf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0610/1118] python-lxml: rebuild for Python 3.9

---
 srcpkgs/python-lxml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index 2b509fca32a..edd977fa652 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -1,7 +1,7 @@
 # Template file for 'python-lxml'
 pkgname=python-lxml
 version=4.4.3
-revision=1
+revision=2
 wrksrc="lxml-lxml-${version}"
 build_style=python-module
 hostmakedepends="libxslt-devel python-Cython python-setuptools python3-Cython python3-setuptools"

From 928d85a1bbb83d51447a14a4c18e1d0d423e558e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0611/1118] python-netifaces: rebuild for Python 3.9

---
 srcpkgs/python-netifaces/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-netifaces/template b/srcpkgs/python-netifaces/template
index 760f657aaba..4bca5a924ad 100644
--- a/srcpkgs/python-netifaces/template
+++ b/srcpkgs/python-netifaces/template
@@ -1,7 +1,7 @@
 # Template file for 'python-netifaces'
 pkgname=python-netifaces
 version=0.10.9
-revision=2
+revision=3
 wrksrc="netifaces-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 73286a4b3662eb4dade6b22f59cde346ee24f011 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0612/1118] python-nose: rebuild for Python 3.9

---
 srcpkgs/python-nose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template
index f5d5cc0bdfb..95f3607a40a 100644
--- a/srcpkgs/python-nose/template
+++ b/srcpkgs/python-nose/template
@@ -1,7 +1,7 @@
 # Template file for 'python-nose'
 pkgname=python-nose
 version=1.3.7
-revision=5
+revision=6
 wrksrc="nose-${version}"
 build_style=python-module
 pycompile_module="nose"

From 9b6298ffffbdff4ade414fbced43ca602d08016a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:18 -0400
Subject: [PATCH 0613/1118] python-openssl: rebuild for Python 3.9

---
 srcpkgs/python-openssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
index 27d5ff265c1..ff1ae3918cb 100644
--- a/srcpkgs/python-openssl/template
+++ b/srcpkgs/python-openssl/template
@@ -1,7 +1,7 @@
 # Template file for 'python-openssl'
 pkgname=python-openssl
 version=19.1.0
-revision=2
+revision=3
 wrksrc="pyOpenSSL-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From a1a3b7688572efb7cb8f9eac8c84bd6933422f26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:19 -0400
Subject: [PATCH 0614/1118] python-packaging: rebuild for Python 3.9

---
 srcpkgs/python-packaging/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-packaging/template b/srcpkgs/python-packaging/template
index 0b5f38565e1..53d522227a1 100644
--- a/srcpkgs/python-packaging/template
+++ b/srcpkgs/python-packaging/template
@@ -1,7 +1,7 @@
 # Template file for 'python-packaging'
 pkgname=python-packaging
 version=19.1
-revision=4
+revision=5
 wrksrc="packaging-${version}"
 build_style=python-module
 pycompile_module="packaging"

From 97e72386f04baad02298c23848cc48799beff524 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:19 -0400
Subject: [PATCH 0615/1118] python-parsing: rebuild for Python 3.9

---
 srcpkgs/python-parsing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python-parsing/template
index e1b9193a9c8..1d938f725f6 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python-parsing/template
@@ -1,7 +1,7 @@
 # Template file for 'python-parsing'
 pkgname=python-parsing
 version=2.4.6
-revision=2
+revision=3
 wrksrc="pyparsing-pyparsing_${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From c67f261a15c258a6fbcd4f3b7b0987c291c5339f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:19 -0400
Subject: [PATCH 0616/1118] python-pathlib2: rebuild for Python 3.9

---
 srcpkgs/python-pathlib2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pathlib2/template b/srcpkgs/python-pathlib2/template
index e40edf9f713..622b82fe66d 100644
--- a/srcpkgs/python-pathlib2/template
+++ b/srcpkgs/python-pathlib2/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pathlib2'
 pkgname=python-pathlib2
 version=2.3.4
-revision=4
+revision=5
 wrksrc="pathlib2-${version}"
 build_style=python-module
 pycompile_module="pathlib2"

From bd115a63986828ba4a751b11ee48b97a3bd75495 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:19 -0400
Subject: [PATCH 0617/1118] python-pbr: rebuild for Python 3.9

---
 srcpkgs/python-pbr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
index d782fe1e996..6d8ac5a1dbf 100644
--- a/srcpkgs/python-pbr/template
+++ b/srcpkgs/python-pbr/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pbr'
 pkgname=python-pbr
 version=5.4.3
-revision=3
+revision=4
 wrksrc="pbr-${version}"
 build_style=python-module
 pycompile_module="pbr"

From b3ffdd847d26ef0f58e66a973e23be3fcba09d29 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:19 -0400
Subject: [PATCH 0618/1118] python-pgpdump: rebuild for Python 3.9

---
 srcpkgs/python-pgpdump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pgpdump/template b/srcpkgs/python-pgpdump/template
index b81b40c0ef8..4c629009edb 100644
--- a/srcpkgs/python-pgpdump/template
+++ b/srcpkgs/python-pgpdump/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pgpdump'
 pkgname=python-pgpdump
 version=1.5
-revision=7
+revision=8
 build_style=python-module
 pycompile_module="pgpdump"
 hostmakedepends="python-setuptools python3-setuptools"

From 8a8664571fca09d15735050d00af9b5218ed8ee3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:19 -0400
Subject: [PATCH 0619/1118] python-ply: rebuild for Python 3.9

---
 srcpkgs/python-ply/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
index 30d5e39067e..37282837f2f 100644
--- a/srcpkgs/python-ply/template
+++ b/srcpkgs/python-ply/template
@@ -1,7 +1,7 @@
 # Template file for 'python-ply'
 pkgname=python-ply
 version=3.11
-revision=3
+revision=4
 wrksrc="ply-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From c880f96c282f4055a38b9afda47a58d0da164f55 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:19 -0400
Subject: [PATCH 0620/1118] python-pretend: rebuild for Python 3.9

---
 srcpkgs/python-pretend/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pretend/template b/srcpkgs/python-pretend/template
index 77bad8acf0e..8703c32f421 100644
--- a/srcpkgs/python-pretend/template
+++ b/srcpkgs/python-pretend/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pretend'
 pkgname=python-pretend
 version=1.0.9
-revision=3
+revision=4
 wrksrc="pretend-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 1184cd68b7d2397d99f817d43ec280ed82be34ca Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:20 -0400
Subject: [PATCH 0621/1118] python-pyasn1: rebuild for Python 3.9

---
 srcpkgs/python-pyasn1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
index 95ed039b870..85eec768dbf 100644
--- a/srcpkgs/python-pyasn1/template
+++ b/srcpkgs/python-pyasn1/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyasn1'
 pkgname=python-pyasn1
 version=0.4.8
-revision=2
+revision=3
 wrksrc="pyasn1-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From afd4d334f2ca75a0d06ea9ae7d7f26e9fe74134c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:20 -0400
Subject: [PATCH 0622/1118] python-pyasn1-modules: rebuild for Python 3.9

---
 srcpkgs/python-pyasn1-modules/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
index 1db99e291a9..918fad29aa5 100644
--- a/srcpkgs/python-pyasn1-modules/template
+++ b/srcpkgs/python-pyasn1-modules/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyasn1-modules'
 pkgname=python-pyasn1-modules
 version=0.2.8
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 pycompile_module="pyasn1_modules"

From 5487836ce8cafcaea141753adbc3624924fe8de0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:20 -0400
Subject: [PATCH 0623/1118] python-pycodestyle: rebuild for Python 3.9

---
 srcpkgs/python-pycodestyle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pycodestyle/template b/srcpkgs/python-pycodestyle/template
index f03c91a0ee1..157a5d5f9fc 100644
--- a/srcpkgs/python-pycodestyle/template
+++ b/srcpkgs/python-pycodestyle/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pycodestyle'
 pkgname=python-pycodestyle
 version=2.6.0
-revision=2
+revision=3
 wrksrc="pycodestyle-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 29e8027dd810f8dc8e42c7fd61724c674e339658 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:20 -0400
Subject: [PATCH 0624/1118] python-pycparser: rebuild for Python 3.9

---
 srcpkgs/python-pycparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
index ff4f32c404b..52a39a9d59d 100644
--- a/srcpkgs/python-pycparser/template
+++ b/srcpkgs/python-pycparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pycparser'
 pkgname=python-pycparser
 version=2.19
-revision=3
+revision=4
 wrksrc="pycparser-${version}"
 build_style=python-module
 pycompile_module="pycparser"

From bdeeb30e63308efcf15c06c53c7149270cd46835 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:20 -0400
Subject: [PATCH 0625/1118] python-pycryptodome: rebuild for Python 3.9

---
 srcpkgs/python-pycryptodome/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template
index 46a40689dc5..a566f67cc03 100644
--- a/srcpkgs/python-pycryptodome/template
+++ b/srcpkgs/python-pycryptodome/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pycryptodome'
 pkgname=python-pycryptodome
 version=3.9.7
-revision=1
+revision=2
 wrksrc="pycryptodome-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 1819149924e9204980a25d427983fb4f2f67f177 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:20 -0400
Subject: [PATCH 0626/1118] python-pyglet: rebuild for Python 3.9

---
 srcpkgs/python-pyglet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python-pyglet/template
index d3fc17b6a15..947f81ea642 100644
--- a/srcpkgs/python-pyglet/template
+++ b/srcpkgs/python-pyglet/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyglet'
 pkgname=python-pyglet
 version=1.4.10
-revision=2
+revision=3
 wrksrc="pyglet-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools unzip"

From 49e2937f91e89674ade1212106091a01078e3723 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:20 -0400
Subject: [PATCH 0627/1118] python-pyserial: rebuild for Python 3.9

---
 srcpkgs/python-pyserial/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pyserial/template b/srcpkgs/python-pyserial/template
index f45d1aad246..315f720dbe9 100644
--- a/srcpkgs/python-pyserial/template
+++ b/srcpkgs/python-pyserial/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pyserial'
 pkgname=python-pyserial
 version=3.4
-revision=4
+revision=5
 wrksrc="pyserial-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From f349f015cf8b0a29c54e747c0968969a550fb847 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0628/1118] python-pystache: rebuild for Python 3.9

---
 srcpkgs/python-pystache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pystache/template b/srcpkgs/python-pystache/template
index ed0d09d544d..4bed7b9403d 100644
--- a/srcpkgs/python-pystache/template
+++ b/srcpkgs/python-pystache/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pystache'
 pkgname=python-pystache
 version=0.5.4
-revision=4
+revision=5
 wrksrc="pystache-${version}"
 build_style=python-module
 pycompile_module="pystache"

From 53c2c5f4d44bb699f9c6af825d789ef97881b1ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0629/1118] python-pytz: rebuild for Python 3.9

---
 srcpkgs/python-pytz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template
index 424e6bc15ac..4ced0e4221d 100644
--- a/srcpkgs/python-pytz/template
+++ b/srcpkgs/python-pytz/template
@@ -1,7 +1,7 @@
 # Template file for 'python-pytz'
 pkgname=python-pytz
 version=2020.1
-revision=1
+revision=2
 wrksrc="pytz-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 25874fc115381c399eabee6471ce99554f5e6483 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0630/1118] python-rdflib: rebuild for Python 3.9

---
 srcpkgs/python-rdflib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
index 8437ac417c4..c921bf33204 100644
--- a/srcpkgs/python-rdflib/template
+++ b/srcpkgs/python-rdflib/template
@@ -1,7 +1,7 @@
 # Template file for 'python-rdflib'
 pkgname=python-rdflib
 version=4.2.2
-revision=4
+revision=5
 wrksrc="rdflib-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From ab1cfcc0af183a2391116526cb33816e11cc71cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0631/1118] python-reportlab: rebuild for Python 3.9

---
 srcpkgs/python-reportlab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-reportlab/template b/srcpkgs/python-reportlab/template
index 5ba341aed29..4fcb53f8a79 100644
--- a/srcpkgs/python-reportlab/template
+++ b/srcpkgs/python-reportlab/template
@@ -1,7 +1,7 @@
 # Template file for 'python-reportlab'
 pkgname=python-reportlab
 version=3.5.42
-revision=1
+revision=2
 wrksrc="reportlab-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools freetype-devel"

From 30a4a07e27d128376806efd56efd794c1e5f367a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0632/1118] python-requests: rebuild for Python 3.9

---
 srcpkgs/python-requests/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index 3222c5bed2c..0919a942d4c 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,7 +1,7 @@
 # Template file for 'python-requests'
 pkgname=python-requests
 version=2.23.0
-revision=2
+revision=3
 wrksrc="requests-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 64c87ddba5edf0352b4ee69041d095b648800c2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0633/1118] python-rfc6555: rebuild for Python 3.9

---
 srcpkgs/python-rfc6555/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-rfc6555/template b/srcpkgs/python-rfc6555/template
index e310dfdabf0..8ff1b98c08d 100644
--- a/srcpkgs/python-rfc6555/template
+++ b/srcpkgs/python-rfc6555/template
@@ -1,7 +1,7 @@
 # Template file for 'python-rfc6555'
 pkgname=python-rfc6555
 version=0.0.0
-revision=3
+revision=4
 wrksrc="rfc6555-${version}"
 build_style=python-module
 pycompile_module="rfc6555"

From ba7c595ae5c2041d9fcc4db2e2c44ec5c45ec3b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0634/1118] python-scandir: rebuild for Python 3.9

---
 srcpkgs/python-scandir/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-scandir/template b/srcpkgs/python-scandir/template
index b02fe6d0281..b60c5835b5c 100644
--- a/srcpkgs/python-scandir/template
+++ b/srcpkgs/python-scandir/template
@@ -1,7 +1,7 @@
 # Template file for 'python-scandir'
 pkgname=python-scandir
 version=1.10.0
-revision=3
+revision=4
 wrksrc="scandir-${version}"
 build_style=python-module
 pycompile_module="scandir.py"

From d51c7e1ceb12d71ab6d58ae53c1ba92b65008f75 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:21 -0400
Subject: [PATCH 0635/1118] python-service_identity: rebuild for Python 3.9

---
 srcpkgs/python-service_identity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
index 88eb3ae4d15..18055c2d455 100644
--- a/srcpkgs/python-service_identity/template
+++ b/srcpkgs/python-service_identity/template
@@ -1,7 +1,7 @@
 # Template file for 'python-service_identity'
 pkgname=python-service_identity
 version=18.1.0
-revision=3
+revision=4
 wrksrc="service_identity-${version}"
 build_style=python-module
 pycompile_module="service_identity"

From 688500b3becf5b68d978232ecef369cf5e92db32 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0636/1118] python-six: rebuild for Python 3.9

---
 srcpkgs/python-six/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index d1b862cd9c7..807d8fb46fd 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -1,7 +1,7 @@
 # Template file for 'python-six'
 pkgname=python-six
 version=1.15.0
-revision=2
+revision=3
 wrksrc="six-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 3eac69ffaf7e0cee72a24f0ec4be22c5294a4de9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0637/1118] python-sqlalchemy-migrate: rebuild for Python 3.9

---
 srcpkgs/python-sqlalchemy-migrate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
index 8b3172216b0..8f94329759b 100644
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ b/srcpkgs/python-sqlalchemy-migrate/template
@@ -1,7 +1,7 @@
 # Template file for 'python-sqlalchemy-migrate'
 pkgname=python-sqlalchemy-migrate
 version=0.12.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 pycompile_module="migrate"

From 28d4bdb1cc48893e42c46e5e70c4fc3c914058b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0638/1118] python-sqlparse: rebuild for Python 3.9

---
 srcpkgs/python-sqlparse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
index 7cbaee84385..8e3b396e3a9 100644
--- a/srcpkgs/python-sqlparse/template
+++ b/srcpkgs/python-sqlparse/template
@@ -1,7 +1,7 @@
 # Template file for 'python-sqlparse'
 pkgname=python-sqlparse
 version=0.3.0
-revision=3
+revision=4
 wrksrc="sqlparse-${version}"
 build_style=python-module
 pycompile_module="sqlparse"

From 3ba48439926777840f0604e6b3fba6211aa44c2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0639/1118] python-tempita: rebuild for Python 3.9

---
 srcpkgs/python-tempita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
index 1d580085566..bd61a4b21de 100644
--- a/srcpkgs/python-tempita/template
+++ b/srcpkgs/python-tempita/template
@@ -1,7 +1,7 @@
 # Template file for 'python-tempita'
 pkgname=python-tempita
 version=0.5.2
-revision=5
+revision=6
 wrksrc="Tempita-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 554faba5b63724db011ba6c10ea0a49409b44b41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0640/1118] python-urllib3: rebuild for Python 3.9

---
 srcpkgs/python-urllib3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 09279b1573e..682a6b783a1 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,7 +1,7 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
 version=1.25.8
-revision=2
+revision=3
 wrksrc="urllib3-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 810548e69c64b2f789793a69cbd00676cc5fc9d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0641/1118] python-urwid: rebuild for Python 3.9

---
 srcpkgs/python-urwid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template
index 4fac8137bc6..7250dfc3306 100644
--- a/srcpkgs/python-urwid/template
+++ b/srcpkgs/python-urwid/template
@@ -1,7 +1,7 @@
 # Template file for 'python-urwid'
 pkgname=python-urwid
 version=2.1.0
-revision=1
+revision=2
 wrksrc="urwid-${version}"
 build_style="python-module"
 hostmakedepends="python-setuptools python3-setuptools"

From c55c08cc072d63399040e099bb1f6c1431b4c670 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0642/1118] python-wcwidth: rebuild for Python 3.9

---
 srcpkgs/python-wcwidth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-wcwidth/template b/srcpkgs/python-wcwidth/template
index 43f9bc1ea24..254d0798c67 100644
--- a/srcpkgs/python-wcwidth/template
+++ b/srcpkgs/python-wcwidth/template
@@ -1,7 +1,7 @@
 # Template file for 'python-wcwidth'
 pkgname=python-wcwidth
 version=0.2.5
-revision=2
+revision=3
 wrksrc="wcwidth-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From f3e8319ccdbec4c61cb055193dec255abbb018e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:22 -0400
Subject: [PATCH 0643/1118] python-xdg: rebuild for Python 3.9

---
 srcpkgs/python-xdg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-xdg/template b/srcpkgs/python-xdg/template
index ad6b2c1e4d2..083f17308d3 100644
--- a/srcpkgs/python-xdg/template
+++ b/srcpkgs/python-xdg/template
@@ -1,7 +1,7 @@
 # Template file for 'python-xdg'
 pkgname=python-xdg
 version=0.26
-revision=3
+revision=4
 wrksrc="pyxdg-${version}"
 build_style=python-module
 hostmakedepends="python python3"

From 4263448464cd7b317af9b333f9867e462ad4bc4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:23 -0400
Subject: [PATCH 0644/1118] python-xlib: rebuild for Python 3.9

---
 srcpkgs/python-xlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-xlib/template b/srcpkgs/python-xlib/template
index 68ffb98bdf0..de315a200d9 100644
--- a/srcpkgs/python-xlib/template
+++ b/srcpkgs/python-xlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python-xlib'
 pkgname=python-xlib
 version=0.27
-revision=2
+revision=3
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-six"

From e30d0a3426cd7dd3f3c8ebe0821c2f689b152ee4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:23 -0400
Subject: [PATCH 0645/1118] python-zope.interface: rebuild for Python 3.9

---
 srcpkgs/python-zope.interface/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
index 2b08dff3db0..97366554381 100644
--- a/srcpkgs/python-zope.interface/template
+++ b/srcpkgs/python-zope.interface/template
@@ -1,7 +1,7 @@
 # Template file for 'python-zope.interface'
 pkgname=python-zope.interface
 version=5.1.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From cad789c3cc16b3df72cedbefd1a28b460facb2d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:23 -0400
Subject: [PATCH 0646/1118] python3-Arrow: rebuild for Python 3.9

---
 srcpkgs/python3-Arrow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Arrow/template b/srcpkgs/python3-Arrow/template
index a03ac3fd2a6..3c81e5ba65f 100644
--- a/srcpkgs/python3-Arrow/template
+++ b/srcpkgs/python3-Arrow/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Arrow'
 pkgname=python3-Arrow
 version=0.15.5
-revision=2
+revision=3
 wrksrc="arrow-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 954021d92c1cf7b129850f40778eaf839b735867 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:23 -0400
Subject: [PATCH 0647/1118] python3-BeautifulSoup4: rebuild for Python 3.9

---
 srcpkgs/python3-BeautifulSoup4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
index 7e2f40ab129..66ba690cf36 100644
--- a/srcpkgs/python3-BeautifulSoup4/template
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-BeautifulSoup4'
 pkgname=python3-BeautifulSoup4
 version=4.8.2
-revision=2
+revision=3
 wrksrc="beautifulsoup4-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 424db37b3cc136cd034a3fc9ec8ab1f330b60d40 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:23 -0400
Subject: [PATCH 0648/1118] python3-Bottleneck: rebuild for Python 3.9

---
 srcpkgs/python3-Bottleneck/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Bottleneck/template b/srcpkgs/python3-Bottleneck/template
index 188385a936e..ffd668d2862 100644
--- a/srcpkgs/python3-Bottleneck/template
+++ b/srcpkgs/python3-Bottleneck/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Bottleneck'
 pkgname=python3-Bottleneck
 version=1.3.2
-revision=2
+revision=3
 wrksrc="Bottleneck-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-numpy"

From a8b01bbca1513fedd10a540446e9bb9693ae999b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:23 -0400
Subject: [PATCH 0649/1118] python3-Cheroot: rebuild for Python 3.9

---
 srcpkgs/python3-Cheroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Cheroot/template b/srcpkgs/python3-Cheroot/template
index a1f74ef3846..95fb8cd16fd 100644
--- a/srcpkgs/python3-Cheroot/template
+++ b/srcpkgs/python3-Cheroot/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Cheroot'
 pkgname=python3-Cheroot
 version=8.3.1
-revision=2
+revision=3
 wrksrc="cheroot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9c7f336359c62f5a7bab2fce96ba8e2d45a9d021 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:23 -0400
Subject: [PATCH 0650/1118] python3-ConfigArgParse: rebuild for Python 3.9

---
 srcpkgs/python3-ConfigArgParse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ConfigArgParse/template b/srcpkgs/python3-ConfigArgParse/template
index dd13ea719a4..ea63fa702d3 100644
--- a/srcpkgs/python3-ConfigArgParse/template
+++ b/srcpkgs/python3-ConfigArgParse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ConfigArgParse'
 pkgname=python3-ConfigArgParse
 version=1.2.3
-revision=1
+revision=2
 wrksrc="ConfigArgParse-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 97409db74a3e08acd983b9396bab9d51023dcd1f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0651/1118] python3-Flask: rebuild for Python 3.9

---
 srcpkgs/python3-Flask/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask/template b/srcpkgs/python3-Flask/template
index b90a920b546..e761c1104c9 100644
--- a/srcpkgs/python3-Flask/template
+++ b/srcpkgs/python3-Flask/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask'
 pkgname=python3-Flask
 version=1.1.2
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1fb0389c2cf52d6770afaa2bd119b971b6673726 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0652/1118] python3-Flask-Assets: rebuild for Python 3.9

---
 srcpkgs/python3-Flask-Assets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Assets/template b/srcpkgs/python3-Flask-Assets/template
index 3c747319020..ae1ff950453 100644
--- a/srcpkgs/python3-Flask-Assets/template
+++ b/srcpkgs/python3-Flask-Assets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Assets'
 pkgname=python3-Flask-Assets
 version=0.12
-revision=5
+revision=6
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 16974fcddac64d49a7a524bac5cabf6bbfe3c35d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0653/1118] python3-Flask-Babel: rebuild for Python 3.9

---
 srcpkgs/python3-Flask-Babel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Babel/template b/srcpkgs/python3-Flask-Babel/template
index 2bf6d808948..00087dab0d7 100644
--- a/srcpkgs/python3-Flask-Babel/template
+++ b/srcpkgs/python3-Flask-Babel/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Babel'
 pkgname=python3-Flask-Babel
 version=2.0.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6f3d96eccd7a092de226af17234de520b6d68c97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0654/1118] python3-Flask-HTTPAuth: rebuild for Python 3.9

---
 srcpkgs/python3-Flask-HTTPAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-HTTPAuth/template b/srcpkgs/python3-Flask-HTTPAuth/template
index cb81e25105a..7670c3df584 100644
--- a/srcpkgs/python3-Flask-HTTPAuth/template
+++ b/srcpkgs/python3-Flask-HTTPAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-HTTPAuth'
 pkgname=python3-Flask-HTTPAuth
 version=4.1.0
-revision=1
+revision=2
 wrksrc=Flask-HTTPAuth-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9faf82e32b308445b0675d96c9e9aa9ce2d1c33d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0655/1118] python3-Flask-Login: rebuild for Python 3.9

---
 srcpkgs/python3-Flask-Login/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Login/template b/srcpkgs/python3-Flask-Login/template
index ee5d3fc6a61..1b5a3045ed8 100644
--- a/srcpkgs/python3-Flask-Login/template
+++ b/srcpkgs/python3-Flask-Login/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Login'
 pkgname=python3-Flask-Login
 version=0.5.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e6aa76c9d9d40c0cad5e5702a08d269cd5c9c010 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0656/1118] python3-Flask-OAuthlib: rebuild for Python 3.9

---
 srcpkgs/python3-Flask-OAuthlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-OAuthlib/template b/srcpkgs/python3-Flask-OAuthlib/template
index 919babd61f5..a8757ecb9b7 100644
--- a/srcpkgs/python3-Flask-OAuthlib/template
+++ b/srcpkgs/python3-Flask-OAuthlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-OAuthlib'
 pkgname=python3-Flask-OAuthlib
 version=0.9.5
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7f76ae95700ecffb15ca5d927fac42d8f75f550c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0657/1118] python3-Flask-Script: rebuild for Python 3.9

---
 srcpkgs/python3-Flask-Script/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-Script/template b/srcpkgs/python3-Flask-Script/template
index 692d682da6a..b91928786f0 100644
--- a/srcpkgs/python3-Flask-Script/template
+++ b/srcpkgs/python3-Flask-Script/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-Script'
 pkgname=python3-Flask-Script
 version=2.0.6
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bad18a7bbdd0d3546cfa6e8aea1e3bc87100428b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:24 -0400
Subject: [PATCH 0658/1118] python3-Flask-WTF: rebuild for Python 3.9

---
 srcpkgs/python3-Flask-WTF/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Flask-WTF/template b/srcpkgs/python3-Flask-WTF/template
index 4ab989ca651..4780e96e154 100644
--- a/srcpkgs/python3-Flask-WTF/template
+++ b/srcpkgs/python3-Flask-WTF/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Flask-WTF'
 pkgname=python3-Flask-WTF
 version=0.14.3
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d6623f30b771b674ed3eb3cc727541f4ace6bb52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0659/1118] python3-GitPython: rebuild for Python 3.9

---
 srcpkgs/python3-GitPython/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-GitPython/template b/srcpkgs/python3-GitPython/template
index 77b3654ad40..2a489e12a11 100644
--- a/srcpkgs/python3-GitPython/template
+++ b/srcpkgs/python3-GitPython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-GitPython'
 pkgname=python3-GitPython
 version=2.1.11
-revision=3
+revision=4
 wrksrc="GitPython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 54410c43b49bf7b23a7b6da2252c0fbe9a56ecf2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0660/1118] python3-IPy: rebuild for Python 3.9

---
 srcpkgs/python3-IPy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-IPy/template b/srcpkgs/python3-IPy/template
index b5fc36135ad..97d2fad9033 100644
--- a/srcpkgs/python3-IPy/template
+++ b/srcpkgs/python3-IPy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-IPy'
 pkgname=python3-IPy
 version=1.00
-revision=3
+revision=4
 wrksrc="IPy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 52acbb5940ba0d1e0178fbe53147da08d731d455 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0661/1118] python3-Levenshtein: rebuild for Python 3.9

---
 srcpkgs/python3-Levenshtein/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Levenshtein/template b/srcpkgs/python3-Levenshtein/template
index db9f0d06365..896de875574 100644
--- a/srcpkgs/python3-Levenshtein/template
+++ b/srcpkgs/python3-Levenshtein/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Levenshtein'
 pkgname=python3-Levenshtein
 version=0.12.0
-revision=4
+revision=5
 wrksrc=python-Levenshtein-$version
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From 3551b07df7da2825e1a7082383fa22ec202bfa20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0662/1118] python3-Mako: rebuild for Python 3.9

---
 srcpkgs/python3-Mako/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Mako/template b/srcpkgs/python3-Mako/template
index 3312217d823..b9fd76af94b 100644
--- a/srcpkgs/python3-Mako/template
+++ b/srcpkgs/python3-Mako/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Mako'
 pkgname=python3-Mako
 version=1.1.3
-revision=2
+revision=3
 wrksrc="Mako-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d5fd486c3b59a4b1b7cb22176a2fef82c4f5b9e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0663/1118] python3-Markups: rebuild for Python 3.9

---
 srcpkgs/python3-Markups/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Markups/template b/srcpkgs/python3-Markups/template
index b72e25c6f64..b216c9777b9 100644
--- a/srcpkgs/python3-Markups/template
+++ b/srcpkgs/python3-Markups/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Markups'
 pkgname=python3-Markups
 version=3.0.0
-revision=4
+revision=5
 wrksrc="Markups-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 27d23de15b105ecd65a1c557a26911080b5d7cc9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0664/1118] python3-MiniMock: rebuild for Python 3.9

---
 srcpkgs/python3-MiniMock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-MiniMock/template b/srcpkgs/python3-MiniMock/template
index 58b44884944..ccfea275e98 100644
--- a/srcpkgs/python3-MiniMock/template
+++ b/srcpkgs/python3-MiniMock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-MiniMock'
 pkgname=python3-MiniMock
 version=1.2.8
-revision=4
+revision=5
 wrksrc="MiniMock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9ce129baf193e3e0964fdb0cc499c0de702160bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0665/1118] python3-PGPy: update to 0.5.3.

---
 srcpkgs/python3-PGPy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template
index 995a1d74fd7..cb7069cb13e 100644
--- a/srcpkgs/python3-PGPy/template
+++ b/srcpkgs/python3-PGPy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PGPy'
 pkgname=python3-PGPy
-version=0.5.2
+version=0.5.3
 revision=1
 wrksrc=PGPy-${version}
 build_style=python3-module
@@ -10,8 +10,8 @@ short_desc="Pretty Good Privacy for Python"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="BSD-3-Clause"
 homepage="https://github.com/SecurityInnovation/PGPy"
-distfiles="https://github.com/SecurityInnovation/PGPy/archive/${version}.tar.gz"
-checksum=85a2dd6fb476ac00a4d4548b9e80fb0f6512d133cc050b6e5f3c40e1b06a79ef
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=5f56454c92fe0c242397166df4618183992d6786c2568cbd21c4090344cf2635
 
 post_install() {
 	vlicense LICENSE

From eb74a6744aa24e747ec40982ffd0cb3f61eb7aea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:25 -0400
Subject: [PATCH 0666/1118] python3-Pillow: rebuild for Python 3.9

---
 srcpkgs/python3-Pillow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template
index f40ce622952..841250be9f2 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
 version=7.2.0
-revision=1
+revision=2
 wrksrc="Pillow-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 546da74c7011adef50c584875c76d37f0ee0579b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0667/1118] python3-PyAudio: rebuild for Python 3.9

---
 srcpkgs/python3-PyAudio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyAudio/template b/srcpkgs/python3-PyAudio/template
index c916530cc1e..9d0f850bd24 100644
--- a/srcpkgs/python3-PyAudio/template
+++ b/srcpkgs/python3-PyAudio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyAudio'
 pkgname=python3-PyAudio
 version=0.2.11
-revision=4
+revision=5
 wrksrc="PyAudio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c98e2aec14b767bb8cca3dcb89af4ec7f7746456 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0668/1118] python3-PyICU: rebuild for Python 3.9

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 33048e4ccbe..2ffda153383 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.5
-revision=2
+revision=3
 wrksrc="PyICU-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 235907a1d90ad5774796255719c9a4a05573ae46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0669/1118] python3-PyJWT: rebuild for Python 3.9

---
 srcpkgs/python3-PyJWT/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
index bf1dda0753e..6ce0464e8cf 100644
--- a/srcpkgs/python3-PyJWT/template
+++ b/srcpkgs/python3-PyJWT/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyJWT'
 pkgname=python3-PyJWT
 version=1.7.1
-revision=2
+revision=3
 wrksrc="PyJWT-${version}"
 build_style=python3-module
 pycompile_module="PyJWT.py"

From 29fb0530cf5c3b18f2537ee28b5655e6d0f7afad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0670/1118] python3-PyOpenGL: rebuild for Python 3.9

---
 srcpkgs/python3-PyOpenGL/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyOpenGL/template b/srcpkgs/python3-PyOpenGL/template
index 1a2f0e1500e..542a0592d5a 100644
--- a/srcpkgs/python3-PyOpenGL/template
+++ b/srcpkgs/python3-PyOpenGL/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyOpenGL'
 pkgname=python3-PyOpenGL
 version=3.1.5
-revision=2
+revision=3
 wrksrc="PyOpenGL-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From de0805204a9f99afdba8d541d9ae7dbe4a91843b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0671/1118] python3-PyOpenGL-accelerate: rebuild for Python 3.9

---
 srcpkgs/python3-PyOpenGL-accelerate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyOpenGL-accelerate/template b/srcpkgs/python3-PyOpenGL-accelerate/template
index 9ddf09f5f1d..baadac0fbe6 100644
--- a/srcpkgs/python3-PyOpenGL-accelerate/template
+++ b/srcpkgs/python3-PyOpenGL-accelerate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyOpenGL-accelerate'
 pkgname=python3-PyOpenGL-accelerate
 version=3.1.5
-revision=1
+revision=2
 wrksrc="PyOpenGL-accelerate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From de3daa07c46d06e35e0cc158dc17ef44e7982ffd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0672/1118] python3-PyPDF2: rebuild for Python 3.9

---
 srcpkgs/python3-PyPDF2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyPDF2/template b/srcpkgs/python3-PyPDF2/template
index 771a4bf4001..b6c055a5569 100644
--- a/srcpkgs/python3-PyPDF2/template
+++ b/srcpkgs/python3-PyPDF2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyPDF2'
 pkgname=python3-PyPDF2
 version=1.26.0
-revision=2
+revision=3
 wrksrc="PyPDF2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 23661df87904acdea7b50702e8ab5f9afe607cc9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0673/1118] python3-PyQt-builder: rebuild for Python 3.9

---
 srcpkgs/python3-PyQt-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index de69efc881c..b41634f0288 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
 version=1.5.0
-revision=2
+revision=3
 wrksrc=PyQt-builder-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2daa553c7775b78d6812af2b370d8b18d9fa6e31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:26 -0400
Subject: [PATCH 0674/1118] python3-PyQt5: rebuild for Python 3.9

---
 srcpkgs/python3-PyQt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 6a5e0edf4e4..b24e2dc6673 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
 version=5.15.1
-revision=1
+revision=2
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
 build_helper=qemu

From af3f13d06ec2de160ae50fc0269d38677a716f54 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0675/1118] python3-PyQt5-webengine: rebuild for Python 3.9

---
 srcpkgs/python3-PyQt5-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index 33956d8a64a..1016281285d 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyQt5-webengine'
 pkgname=python3-PyQt5-webengine
 version=5.15.1
-revision=1
+revision=2
 wrksrc="PyQtWebEngine-${version}"
 hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip5 qt5-webengine-devel
  python3-PyQt-builder python3-PyQt5-devel

From 17191b9bcda9927f2e0870cd271750665e98122e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0676/1118] python3-Pyro4: rebuild for Python 3.9

---
 srcpkgs/python3-Pyro4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Pyro4/template b/srcpkgs/python3-Pyro4/template
index 27fcf25cb99..a60b9ff99da 100644
--- a/srcpkgs/python3-Pyro4/template
+++ b/srcpkgs/python3-Pyro4/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Pyro4'
 pkgname=python3-Pyro4
 version=4.80
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 06a878829fc376049812e45fa98949091425bbb6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0677/1118] python3-SPARQLWrapper: rebuild for Python 3.9

---
 srcpkgs/python3-SPARQLWrapper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-SPARQLWrapper/template b/srcpkgs/python3-SPARQLWrapper/template
index 5a6da8a548c..4ef6a709dcf 100644
--- a/srcpkgs/python3-SPARQLWrapper/template
+++ b/srcpkgs/python3-SPARQLWrapper/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-SPARQLWrapper'
 pkgname=python3-SPARQLWrapper
 version=1.8.4
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d42e1f5474fb50a28b39a9d6d8f370af2dd337f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0678/1118] python3-Sphinx: rebuild for Python 3.9

---
 srcpkgs/python3-Sphinx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 5a4f7d20622..0036808052d 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
 version=3.2.1
-revision=2
+revision=3
 wrksrc=Sphinx-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3a4ffc7c4027cfe9f1fe41690ee4a7052b6b6f67 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0679/1118] python3-Unidecode: rebuild for Python 3.9

---
 srcpkgs/python3-Unidecode/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Unidecode/template b/srcpkgs/python3-Unidecode/template
index c901fe45e05..9dbf90e2df4 100644
--- a/srcpkgs/python3-Unidecode/template
+++ b/srcpkgs/python3-Unidecode/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Unidecode'
 pkgname=python3-Unidecode
 version=1.1.1
-revision=3
+revision=4
 wrksrc="Unidecode-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9168805eb41cc462bc904cdc2fe42e6415733679 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0680/1118] python3-WTForms: rebuild for Python 3.9

---
 srcpkgs/python3-WTForms/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-WTForms/template b/srcpkgs/python3-WTForms/template
index 6e2d13e84b3..fd294b09f00 100644
--- a/srcpkgs/python3-WTForms/template
+++ b/srcpkgs/python3-WTForms/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-WTForms'
 pkgname=python3-WTForms
 version=2.2.1
-revision=3
+revision=4
 wrksrc="WTForms-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8069933d7ee60f25a7dd8357ab70b701cfa27627 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0681/1118] python3-Werkzeug: rebuild for Python 3.9

---
 srcpkgs/python3-Werkzeug/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index d0722e9d93b..328535e25fb 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Werkzeug'
 pkgname=python3-Werkzeug
 version=1.0.1
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 483def6c54b7c6824edff18305cf9b959ac0369c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:27 -0400
Subject: [PATCH 0682/1118] python3-Whoosh: rebuild for Python 3.9

---
 srcpkgs/python3-Whoosh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Whoosh/template b/srcpkgs/python3-Whoosh/template
index aa10143f91c..229ff8ac902 100644
--- a/srcpkgs/python3-Whoosh/template
+++ b/srcpkgs/python3-Whoosh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Whoosh'
 pkgname=python3-Whoosh
 version=2.7.4
-revision=3
+revision=4
 wrksrc="Whoosh-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From cd45015a87f0776e8b1f926984dcc54c4e19d0e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0683/1118] python3-Yapsy: rebuild for Python 3.9

---
 srcpkgs/python3-Yapsy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-Yapsy/template b/srcpkgs/python3-Yapsy/template
index 38b88be2a1a..634e59282a4 100644
--- a/srcpkgs/python3-Yapsy/template
+++ b/srcpkgs/python3-Yapsy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-Yapsy'
 pkgname=python3-Yapsy
 version=1.12.2
-revision=3
+revision=4
 wrksrc="Yapsy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5d18a97736ea7f6efe412413ebee7a2afe79753a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0684/1118] python3-aalib: rebuild for Python 3.9

---
 srcpkgs/python3-aalib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aalib/template b/srcpkgs/python3-aalib/template
index 3dad9f20994..edc004b1543 100644
--- a/srcpkgs/python3-aalib/template
+++ b/srcpkgs/python3-aalib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aalib'
 pkgname=python3-aalib
 version=0.3.2
-revision=3
+revision=4
 wrksrc=python-aalib-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8d2726cd8326d167f89c67b5e21bff3f3a32fa5f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0685/1118] python3-acme: rebuild for Python 3.9

---
 srcpkgs/python3-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 5cb3b09b18d..c44deb43ac5 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
 version=1.8.0
-revision=1
+revision=2
 wrksrc="acme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 238b904fe7e616983305d9923a365bb4039bddf9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0686/1118] python3-aiohttp: rebuild for Python 3.9

---
 srcpkgs/python3-aiohttp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template
index d7f91e87d6e..2893cf6e890 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp'
 pkgname=python3-aiohttp
 version=3.6.2
-revision=2
+revision=3
 wrksrc="aiohttp-${version}"
 build_style=python3-module
 pycompile_module="aiohttp"

From bff52684545d3cf834d4354131ca632246b24d22 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0687/1118] python3-aiohttp2: rebuild for Python 3.9

---
 srcpkgs/python3-aiohttp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-aiohttp2/template b/srcpkgs/python3-aiohttp2/template
index db3704b5700..9a839c29ab7 100644
--- a/srcpkgs/python3-aiohttp2/template
+++ b/srcpkgs/python3-aiohttp2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aiohttp2'
 pkgname=python3-aiohttp2
 version=2.3.10
-revision=3
+revision=4
 wrksrc="aiohttp-${version}"
 build_style=python3-module
 pycompile_module="aiohttp"

From 4a938ed0eb0822a394dcaf5cc6a22d2e0d73df41 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0688/1118] python3-alabaster: rebuild for Python 3.9

---
 srcpkgs/python3-alabaster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-alabaster/template b/srcpkgs/python3-alabaster/template
index 736913e821e..830957dcb2b 100644
--- a/srcpkgs/python3-alabaster/template
+++ b/srcpkgs/python3-alabaster/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-alabaster'
 pkgname=python3-alabaster
 version=0.7.12
-revision=3
+revision=4
 wrksrc="alabaster-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a1f7f0001bea0d7afe0ace73134b61b1ad35a32d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0689/1118] python3-alembic: rebuild for Python 3.9

---
 srcpkgs/python3-alembic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-alembic/template b/srcpkgs/python3-alembic/template
index ef1e98babf1..788d37798a4 100644
--- a/srcpkgs/python3-alembic/template
+++ b/srcpkgs/python3-alembic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-alembic'
 pkgname=python3-alembic
 version=1.4.2
-revision=3
+revision=4
 wrksrc="alembic-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6dc1b4f4bfb189eac8b7ddfb55f84c1be4c24d13 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:28 -0400
Subject: [PATCH 0690/1118] python3-alsa: rebuild for Python 3.9

---
 srcpkgs/python3-alsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-alsa/template b/srcpkgs/python3-alsa/template
index edfc2e7dafb..eb7bbd479c2 100644
--- a/srcpkgs/python3-alsa/template
+++ b/srcpkgs/python3-alsa/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-alsa'
 pkgname=python3-alsa
 version=1.1.6
-revision=2
+revision=3
 wrksrc="pyalsa-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3a5f72cc8bc573c1aa9422e19dede178af89eb2f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0691/1118] python3-ansicolor: rebuild for Python 3.9

---
 srcpkgs/python3-ansicolor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ansicolor/template b/srcpkgs/python3-ansicolor/template
index c60eea83303..657c0fcf350 100644
--- a/srcpkgs/python3-ansicolor/template
+++ b/srcpkgs/python3-ansicolor/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ansicolor'
 pkgname=python3-ansicolor
 version=0.2.6
-revision=4
+revision=5
 wrksrc="ansicolor-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c22c45cab067ff65eed51a650c1e0c11df38dc62 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0692/1118] python3-appdirs: rebuild for Python 3.9

---
 srcpkgs/python3-appdirs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-appdirs/template b/srcpkgs/python3-appdirs/template
index 20ba0a1dd26..393dda8d025 100644
--- a/srcpkgs/python3-appdirs/template
+++ b/srcpkgs/python3-appdirs/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-appdirs'
 pkgname=python3-appdirs
 version=1.4.4
-revision=2
+revision=3
 wrksrc="appdirs-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 04912b3339553b5075cf674b65e2af1c94ca7272 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0693/1118] python3-apsw: rebuild for Python 3.9

---
 srcpkgs/python3-apsw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-apsw/template b/srcpkgs/python3-apsw/template
index 48cc530c1ec..61e77aff002 100644
--- a/srcpkgs/python3-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -3,7 +3,7 @@ pkgname=python3-apsw
 _distver=3.32.2
 _patchver=r1
 version=${_distver}${_patchver}
-revision=2
+revision=3
 wrksrc="apsw-${_distver}-${_patchver}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From ff5ef1d3556801768b9c31dc1cb94ac0a2884f3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0694/1118] python3-argcomplete: rebuild for Python 3.9

---
 srcpkgs/python3-argcomplete/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template
index 00fe9b76b68..92c1be0098f 100644
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
 version=1.12.1
-revision=1
+revision=2
 wrksrc="argcomplete-${version}"
 build_style=python3-module
 pycompile_module="argcomplete"

From 63f9b93758738968adf251084854af3e013ee341 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0695/1118] python3-argh: rebuild for Python 3.9

---
 srcpkgs/python3-argh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-argh/template b/srcpkgs/python3-argh/template
index 51d4e18343d..633671c032c 100644
--- a/srcpkgs/python3-argh/template
+++ b/srcpkgs/python3-argh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-argh'
 pkgname=python3-argh
 version=0.26.2
-revision=3
+revision=4
 wrksrc="argh-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 877740306ad3d4d4fb7b2407ad0d5d3ec6a400b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0696/1118] python3-argon2: rebuild for Python 3.9

---
 srcpkgs/python3-argon2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-argon2/template b/srcpkgs/python3-argon2/template
index 37c99f12a82..c81d31cced1 100644
--- a/srcpkgs/python3-argon2/template
+++ b/srcpkgs/python3-argon2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-argon2'
 pkgname=python3-argon2
 version=19.2.0
-revision=1
+revision=2
 wrksrc="argon2-cffi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From fa43653adc189e94376111bca51aea5c1d9b5947 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0697/1118] python3-arxiv2bib: rebuild for Python 3.9

---
 srcpkgs/python3-arxiv2bib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-arxiv2bib/template b/srcpkgs/python3-arxiv2bib/template
index 74d3cc90961..b59206102e3 100644
--- a/srcpkgs/python3-arxiv2bib/template
+++ b/srcpkgs/python3-arxiv2bib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-arxiv2bib'
 pkgname=python3-arxiv2bib
 version=1.0.8
-revision=4
+revision=5
 wrksrc="arxiv2bib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 833e5587a9315945621acf2e7d919569643ca324 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:29 -0400
Subject: [PATCH 0698/1118] python3-asn1crypto: rebuild for Python 3.9

---
 srcpkgs/python3-asn1crypto/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-asn1crypto/template b/srcpkgs/python3-asn1crypto/template
index d930b7b43ee..f85186e64e7 100644
--- a/srcpkgs/python3-asn1crypto/template
+++ b/srcpkgs/python3-asn1crypto/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-asn1crypto'
 pkgname=python3-asn1crypto
 version=0.24.0
-revision=3
+revision=4
 wrksrc="asn1crypto-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From af2c5d2792f62011f9e30e0851e9ad2e05c4bf50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0699/1118] python3-atspi: rebuild for Python 3.9

---
 srcpkgs/python3-atspi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-atspi/template b/srcpkgs/python3-atspi/template
index 504e85daf38..36ffedcc59f 100644
--- a/srcpkgs/python3-atspi/template
+++ b/srcpkgs/python3-atspi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-atspi'
 pkgname=python3-atspi
 version=2.38.0
-revision=2
+revision=3
 wrksrc="pyatspi-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"

From e933174da3fa6dbc052f45bb22bd7b3d414e43d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0700/1118] python3-audioread: rebuild for Python 3.9

---
 srcpkgs/python3-audioread/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template
index 41ff43ccf4a..8db13a91ddb 100644
--- a/srcpkgs/python3-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-audioread'
 pkgname=python3-audioread
 version=2.1.8
-revision=3
+revision=4
 wrksrc="audioread-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1b8b5923115c302b8c06bb2b8b3ea72086ec6a35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0701/1118] python3-axolotl: rebuild for Python 3.9

---
 srcpkgs/python3-axolotl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-axolotl/template b/srcpkgs/python3-axolotl/template
index 356d702b55d..b0146e392b3 100644
--- a/srcpkgs/python3-axolotl/template
+++ b/srcpkgs/python3-axolotl/template
@@ -2,7 +2,7 @@
 pkgname=python3-axolotl
 _pkgname=${pkgname/3/}
 version=0.2.3
-revision=3
+revision=4
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d432a623420a232a9d79d0f0180a8f73a461a6f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0702/1118] python3-axolotl-curve25519: rebuild for Python 3.9

---
 srcpkgs/python3-axolotl-curve25519/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-axolotl-curve25519/template b/srcpkgs/python3-axolotl-curve25519/template
index 46b06455f09..89a97b2ddfe 100644
--- a/srcpkgs/python3-axolotl-curve25519/template
+++ b/srcpkgs/python3-axolotl-curve25519/template
@@ -2,7 +2,7 @@
 pkgname=python3-axolotl-curve25519
 _pkgname=${pkgname/3/}
 version=0.4.1.post2
-revision=3
+revision=4
 wrksrc="$_pkgname-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f7863478e9e6afe976e71de5084b881e5dfae56f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0703/1118] python3-babelfish: rebuild for Python 3.9

---
 srcpkgs/python3-babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-babelfish/template b/srcpkgs/python3-babelfish/template
index 57dedc929f0..df4e86ded3e 100644
--- a/srcpkgs/python3-babelfish/template
+++ b/srcpkgs/python3-babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-babelfish'
 pkgname=python3-babelfish
 version=0.5.5
-revision=3
+revision=4
 wrksrc="babelfish-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4b7b216e6061f7e41352e54acd4c4f532bd9583c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0704/1118] python3-backcall: rebuild for Python 3.9

---
 srcpkgs/python3-backcall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-backcall/template b/srcpkgs/python3-backcall/template
index b08e321c8eb..f62eb7cf259 100644
--- a/srcpkgs/python3-backcall/template
+++ b/srcpkgs/python3-backcall/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-backcall'
 pkgname=python3-backcall
 version=0.2.0
-revision=3
+revision=4
 wrksrc="backcall-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fa402ee2adc36fd7aac99f600bd96b0a55a8c3ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0705/1118] python3-bibtexparser: rebuild for Python 3.9

---
 srcpkgs/python3-bibtexparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bibtexparser/template b/srcpkgs/python3-bibtexparser/template
index f0c05f8f76a..0f0a67dc351 100644
--- a/srcpkgs/python3-bibtexparser/template
+++ b/srcpkgs/python3-bibtexparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bibtexparser'
 pkgname=python3-bibtexparser
 version=1.1.0
-revision=3
+revision=4
 wrksrc="bibtexparser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8eb734cd4d72c4d3c8924eaa0d5a5f4b5f0b3957 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:30 -0400
Subject: [PATCH 0706/1118] python3-bitarray: rebuild for Python 3.9

---
 srcpkgs/python3-bitarray/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bitarray/template b/srcpkgs/python3-bitarray/template
index c465f68b741..cf98978d288 100644
--- a/srcpkgs/python3-bitarray/template
+++ b/srcpkgs/python3-bitarray/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bitarray'
 pkgname=python3-bitarray
 version=1.0.1
-revision=3
+revision=4
 wrksrc="bitarray-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 81281039b4c2bc339fc9bb611a85009b8d7e2e66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0707/1118] python3-bitbucket-api: rebuild for Python 3.9

---
 srcpkgs/python3-bitbucket-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bitbucket-api/template b/srcpkgs/python3-bitbucket-api/template
index 2de7f55e837..e725d60808e 100644
--- a/srcpkgs/python3-bitbucket-api/template
+++ b/srcpkgs/python3-bitbucket-api/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bitbucket-api'
 pkgname=python3-bitbucket-api
 version=0.5.0
-revision=5
+revision=6
 wrksrc="bitbucket-api-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ac6a8167e97ea6b3c737fa7e6f78b6126b17fd38 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0708/1118] python3-bleach: rebuild for Python 3.9

---
 srcpkgs/python3-bleach/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template
index 20e2b3d04c2..34ba5371b45 100644
--- a/srcpkgs/python3-bleach/template
+++ b/srcpkgs/python3-bleach/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bleach'
 pkgname=python3-bleach
 version=3.1.1
-revision=2
+revision=3
 wrksrc="bleach-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 94780884ada5f380d7d80af2621a6bc87d25a880 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0709/1118] python3-blessings: rebuild for Python 3.9

---
 srcpkgs/python3-blessings/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-blessings/template b/srcpkgs/python3-blessings/template
index 914f8922590..d901e189a1e 100644
--- a/srcpkgs/python3-blessings/template
+++ b/srcpkgs/python3-blessings/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-blessings'
 pkgname=python3-blessings
 version=1.7
-revision=3
+revision=4
 wrksrc="blessings-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 41fa74f7db68cf3bb83297e7044eb7b7a62cba21 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0710/1118] python3-blinker: rebuild for Python 3.9

---
 srcpkgs/python3-blinker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-blinker/template b/srcpkgs/python3-blinker/template
index 4639d5c8d8b..c500b7cc5ed 100644
--- a/srcpkgs/python3-blinker/template
+++ b/srcpkgs/python3-blinker/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-blinker'
 pkgname=python3-blinker
 version=1.4
-revision=5
+revision=6
 wrksrc="blinker-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 807a9756e628646829f02165f5978e0351a5b5c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0711/1118] python3-bluez: rebuild for Python 3.9

---
 srcpkgs/python3-bluez/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bluez/template b/srcpkgs/python3-bluez/template
index 4f503ebcfdf..2feb64200f1 100644
--- a/srcpkgs/python3-bluez/template
+++ b/srcpkgs/python3-bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bluez'
 pkgname=python3-bluez
 version=0.23
-revision=1
+revision=2
 wrksrc="PyBluez-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From 9feb3646e00bfbfc812dede0c09262a3d0248dd9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0712/1118] python3-bokeh: rebuild for Python 3.9

---
 srcpkgs/python3-bokeh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index 868a42589a0..2d5c49b9158 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
 version=2.2.1
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 make_build_args="--build-js"

From c9715479b83d6559ec947b4548ba5fbdba78433e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0713/1118] python3-boto3: rebuild for Python 3.9

---
 srcpkgs/python3-boto3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template
index ced73ce133a..46fe01e4725 100644
--- a/srcpkgs/python3-boto3/template
+++ b/srcpkgs/python3-boto3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-boto3'
 pkgname=python3-boto3
 version=1.15.9
-revision=1
+revision=2
 wrksrc="boto3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 170941272a42c04e47b653265d527f811501544c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:31 -0400
Subject: [PATCH 0714/1118] python3-botocore: rebuild for Python 3.9

---
 srcpkgs/python3-botocore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index d4ac8e92f37..72884e6d76a 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-botocore'
 pkgname=python3-botocore
 version=1.17.28
-revision=2
+revision=3
 wrksrc="botocore-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2ce3b6ad7ce595eae7fd3c3ace99ee41299044c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:32 -0400
Subject: [PATCH 0715/1118] python3-bottle: rebuild for Python 3.9

---
 srcpkgs/python3-bottle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bottle/template b/srcpkgs/python3-bottle/template
index bf3d043c880..6830a790096 100644
--- a/srcpkgs/python3-bottle/template
+++ b/srcpkgs/python3-bottle/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bottle'
 pkgname=python3-bottle
 version=0.12.17
-revision=3
+revision=4
 wrksrc="bottle-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 796ee9a907249b9adac093ede893229dcb34ca9d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:32 -0400
Subject: [PATCH 0716/1118] python3-breathe: rebuild for Python 3.9

---
 srcpkgs/python3-breathe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index c754a650ae7..80dfbf5b7b8 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
 version=4.22.1
-revision=1
+revision=2
 wrksrc="breathe-${version}"
 build_style=python3-module
 _pyreqs="python3-Sphinx python3-docutils python3-six"

From f626e24e7fa378cc051f8b2557522655e7f5a7dc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:32 -0400
Subject: [PATCH 0717/1118] python3-bsddb3: rebuild for Python 3.9

---
 srcpkgs/python3-bsddb3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-bsddb3/template b/srcpkgs/python3-bsddb3/template
index e7b4d1e232a..7f146cf967e 100644
--- a/srcpkgs/python3-bsddb3/template
+++ b/srcpkgs/python3-bsddb3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-bsddb3'
 pkgname=python3-bsddb3
 version=6.2.6
-revision=4
+revision=5
 wrksrc="bsddb3-${version}"
 build_style=python3-module
 make_build_args="--berkeley-db=${XBPS_CROSS_BASE}/usr"

From 3570ff604352879fb92915ac62ee660c5d54135b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:32 -0400
Subject: [PATCH 0718/1118] python3-cached-property: rebuild for Python 3.9

---
 srcpkgs/python3-cached-property/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template
index ddb395595cf..07032f40d4c 100644
--- a/srcpkgs/python3-cached-property/template
+++ b/srcpkgs/python3-cached-property/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cached-property'
 pkgname=python3-cached-property
 version=1.5.1
-revision=3
+revision=4
 wrksrc="cached-property-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a5f07832a5ae32503408ea18269356710a93725f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:32 -0400
Subject: [PATCH 0719/1118] python3-cachetools: rebuild for Python 3.9

---
 srcpkgs/python3-cachetools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cachetools/template b/srcpkgs/python3-cachetools/template
index e29000bcb7a..b9af9fafddf 100644
--- a/srcpkgs/python3-cachetools/template
+++ b/srcpkgs/python3-cachetools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cachetools'
 pkgname=python3-cachetools
 version=4.1.1
-revision=1
+revision=2
 wrksrc="cachetools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 943864fabb82eb2fa74a806fe4d652860d6112d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:32 -0400
Subject: [PATCH 0720/1118] python3-cairo: rebuild for Python 3.9

---
 srcpkgs/python3-cairo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cairo/template b/srcpkgs/python3-cairo/template
index b55380f1d66..581238ce4db 100644
--- a/srcpkgs/python3-cairo/template
+++ b/srcpkgs/python3-cairo/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cairo'
 pkgname=python3-cairo
 version=1.19.1
-revision=2
+revision=3
 wrksrc="pycairo-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3"

From adf0c17429461fe07bc0209da102987216514b7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:32 -0400
Subject: [PATCH 0721/1118] python3-cairocffi: rebuild for Python 3.9

---
 srcpkgs/python3-cairocffi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cairocffi/template b/srcpkgs/python3-cairocffi/template
index 79c465e5bb9..4cbab0adc18 100644
--- a/srcpkgs/python3-cairocffi/template
+++ b/srcpkgs/python3-cairocffi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cairocffi'
 pkgname=python3-cairocffi
 version=0.9.0
-revision=4
+revision=5
 wrksrc="cairocffi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From 961cfee8cf8a6427d8c7ea9662288579cbe079be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0722/1118] python3-cheetah3: rebuild for Python 3.9

---
 srcpkgs/python3-cheetah3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template
index 79b68c8e9fd..2dd6d8c8cc2 100644
--- a/srcpkgs/python3-cheetah3/template
+++ b/srcpkgs/python3-cheetah3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cheetah3'
 pkgname=python3-cheetah3
 version=3.2.5
-revision=1
+revision=2
 wrksrc="Cheetah3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f3791e40215e357a8625a30b417d85ed5cef88f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0723/1118] python3-chroot: update to 0.10.1

---
 srcpkgs/python3-chroot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-chroot/template b/srcpkgs/python3-chroot/template
index ff679c914cf..0698fd872c3 100644
--- a/srcpkgs/python3-chroot/template
+++ b/srcpkgs/python3-chroot/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-chroot'
 pkgname=python3-chroot
-version=0.9.18
-revision=3
+version=0.10.1
+revision=1
 wrksrc="pychroot-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-snakeoil"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/pkgcore/pychroot"
 #changelog="https://github.com/pkgcore/pychroot/blob/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pychroot/pychroot-${version}.tar.gz"
-checksum=ec78082c9ea8a30733ac1cf9773431fe118fb4cbeaf1098572c3b8e4e16eb7aa
+checksum=10b2d5195062d110df8e28bcdb1d79d1e8109fb77a226455ab2df6b40e7ff289
 conflicts="python-chroot>=0"
 
 post_install() {

From 5474b9cb929eaa496f99366cfa45c0514c746a7f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0724/1118] python3-ciso8601: rebuild for Python 3.9

---
 srcpkgs/python3-ciso8601/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template
index 7dda3463dd1..e060dd65211 100644
--- a/srcpkgs/python3-ciso8601/template
+++ b/srcpkgs/python3-ciso8601/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ciso8601'
 pkgname=python3-ciso8601
 version=2.1.3
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2fad2f77863f3ea03d88c473089dd70c0d782db9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0725/1118] python3-click: rebuild for Python 3.9

---
 srcpkgs/python3-click/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
index 2b29bebfbcc..71c8e0fc0b8 100644
--- a/srcpkgs/python3-click/template
+++ b/srcpkgs/python3-click/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click'
 pkgname=python3-click
 version=7.1.2
-revision=3
+revision=4
 wrksrc="click-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 74eee6940460bb83328abfa4610be15175ce17a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0726/1118] python3-click-log: rebuild for Python 3.9

---
 srcpkgs/python3-click-log/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template
index 340f9b17397..d4d8bbb2218 100644
--- a/srcpkgs/python3-click-log/template
+++ b/srcpkgs/python3-click-log/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click-log'
 pkgname=python3-click-log
 version=0.3.2
-revision=3
+revision=4
 wrksrc="click-log-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 4d54357556466ab9c26d24c09ec5cda331a60adc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0727/1118] python3-click-threading: rebuild for Python 3.9

---
 srcpkgs/python3-click-threading/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
index 56928810364..b5961980595 100644
--- a/srcpkgs/python3-click-threading/template
+++ b/srcpkgs/python3-click-threading/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-click-threading'
 pkgname=python3-click-threading
 version=0.4.4
-revision=3
+revision=4
 wrksrc="click-threading-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From e36b3dfd86cd773d69dfdb90a85fe361c4128429 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0728/1118] python3-codespell: rebuild for Python 3.9

---
 srcpkgs/python3-codespell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
index 04e342d5e5c..98583fb9259 100644
--- a/srcpkgs/python3-codespell/template
+++ b/srcpkgs/python3-codespell/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-codespell'
 pkgname=python3-codespell
 version=1.16.0
-revision=3
+revision=4
 wrksrc="codespell-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 541df74a893ae188ed9d1f46c8bd18cd159b18bb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:33 -0400
Subject: [PATCH 0729/1118] python3-colorama: rebuild for Python 3.9

---
 srcpkgs/python3-colorama/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
index 0c5a1c44626..b8e418bb4c4 100644
--- a/srcpkgs/python3-colorama/template
+++ b/srcpkgs/python3-colorama/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-colorama'
 pkgname=python3-colorama
 version=0.4.1
-revision=3
+revision=4
 wrksrc="colorama-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"

From 9e71f26cea24a99ed79fb08a93589a994a24548c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0730/1118] python3-construct: rebuild for Python 3.9

---
 srcpkgs/python3-construct/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-construct/template b/srcpkgs/python3-construct/template
index 3fa3d0018e9..72fd978ad9b 100644
--- a/srcpkgs/python3-construct/template
+++ b/srcpkgs/python3-construct/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-construct'
 pkgname=python3-construct
 version=2.9.45
-revision=4
+revision=5
 wrksrc="construct-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e29caf28680fba850fe2e804255bb87892091b29 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0731/1118] python3-cram: rebuild for Python 3.9

---
 srcpkgs/python3-cram/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cram/template b/srcpkgs/python3-cram/template
index fc42482ede5..c66a8e66783 100644
--- a/srcpkgs/python3-cram/template
+++ b/srcpkgs/python3-cram/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cram'
 pkgname=python3-cram
 version=0.7
-revision=4
+revision=5
 wrksrc="cram-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d32c98afdd8e6dbb614ec6cda8f7c82b88113972 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0732/1118] python3-crccheck: rebuild for Python 3.9

---
 srcpkgs/python3-crccheck/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-crccheck/template b/srcpkgs/python3-crccheck/template
index 05c98d58892..3ed3234a97f 100644
--- a/srcpkgs/python3-crccheck/template
+++ b/srcpkgs/python3-crccheck/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-crccheck'
 pkgname=python3-crccheck
 version=1.0
-revision=1
+revision=2
 wrksrc="crccheck-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ac92791889933abc54bd59611f8356a6cef410d2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0733/1118] python3-crcmod: rebuild for Python 3.9

---
 srcpkgs/python3-crcmod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-crcmod/template b/srcpkgs/python3-crcmod/template
index 9311dedc8ac..e7cd5f22f48 100644
--- a/srcpkgs/python3-crcmod/template
+++ b/srcpkgs/python3-crcmod/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-crcmod'
 pkgname=python3-crcmod
 version=1.7
-revision=2
+revision=3
 wrksrc="crcmod-${version}"
 build_style=python3-module
 pycompile_module="crcmod"

From ca8d994084996b426bc4d69498cbb7d0b61e231c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0734/1118] python3-css-parser: rebuild for Python 3.9

---
 srcpkgs/python3-css-parser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
index 12d7796b622..100907943ce 100644
--- a/srcpkgs/python3-css-parser/template
+++ b/srcpkgs/python3-css-parser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-css-parser'
 pkgname=python3-css-parser
 version=1.0.4
-revision=4
+revision=5
 wrksrc="css-parser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ea16b4a622386a1b8677cd9b7abff690cf62abe9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0735/1118] python3-cssselect: rebuild for Python 3.9

---
 srcpkgs/python3-cssselect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
index d35ad7ccd66..42383703e63 100644
--- a/srcpkgs/python3-cssselect/template
+++ b/srcpkgs/python3-cssselect/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cssselect'
 pkgname=python3-cssselect
 version=1.1.0
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a9c2fe815accb1f6a5d4d57ae365a15ca6a433dd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0736/1118] python3-cssutils: rebuild for Python 3.9

---
 srcpkgs/python3-cssutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cssutils/template b/srcpkgs/python3-cssutils/template
index 7ed166c2b0c..83910cdada3 100644
--- a/srcpkgs/python3-cssutils/template
+++ b/srcpkgs/python3-cssutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cssutils'
 pkgname=python3-cssutils
 version=1.0.2
-revision=4
+revision=5
 wrksrc="cssutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 849a5867b40341d9fa523a02db2042615fe5d855 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:34 -0400
Subject: [PATCH 0737/1118] python3-cups: rebuild for Python 3.9

---
 srcpkgs/python3-cups/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cups/template b/srcpkgs/python3-cups/template
index 4af62b224fe..7f57935c313 100644
--- a/srcpkgs/python3-cups/template
+++ b/srcpkgs/python3-cups/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cups'
 pkgname=python3-cups
 version=1.9.74
-revision=4
+revision=5
 wrksrc="pycups-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 7d075137679ea28a0ef270a36359ace52532a9f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:35 -0400
Subject: [PATCH 0738/1118] python3-curl: rebuild for Python 3.9

---
 srcpkgs/python3-curl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index c9a52460cad..8405b412383 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
 version=7.43.0.3
-revision=8
+revision=9
 wrksrc="pycurl-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 81e7301b0553df976271b32ad3ece7b104b323b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:35 -0400
Subject: [PATCH 0739/1118] python3-curtsies: rebuild for Python 3.9

---
 srcpkgs/python3-curtsies/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-curtsies/template b/srcpkgs/python3-curtsies/template
index 25277e5fa28..0d03da5b9b3 100644
--- a/srcpkgs/python3-curtsies/template
+++ b/srcpkgs/python3-curtsies/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-curtsies'
 pkgname=python3-curtsies
 version=0.3.0
-revision=3
+revision=4
 wrksrc="curtsies-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 96eb190a547b16a9c64973f2b9ab4834a906235c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:35 -0400
Subject: [PATCH 0740/1118] python3-cycler: rebuild for Python 3.9

---
 srcpkgs/python3-cycler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cycler/template b/srcpkgs/python3-cycler/template
index 7c4083a39af..1163ab06248 100644
--- a/srcpkgs/python3-cycler/template
+++ b/srcpkgs/python3-cycler/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cycler'
 pkgname=python3-cycler
 version=0.10.0
-revision=6
+revision=7
 wrksrc="cycler-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e1a18a8b9e8a8195af206e2f2d8d25407eb53c16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:35 -0400
Subject: [PATCH 0741/1118] python3-daemonize: rebuild for Python 3.9

---
 srcpkgs/python3-daemonize/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-daemonize/template b/srcpkgs/python3-daemonize/template
index a0870abb617..274e42079fc 100644
--- a/srcpkgs/python3-daemonize/template
+++ b/srcpkgs/python3-daemonize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-daemonize'
 pkgname=python3-daemonize
 version=2.5.0
-revision=3
+revision=4
 wrksrc="daemonize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c3d098e0cf463b414fc099c2309408047e5430db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:35 -0400
Subject: [PATCH 0742/1118] python3-defusedxml: rebuild for Python 3.9

---
 srcpkgs/python3-defusedxml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-defusedxml/template b/srcpkgs/python3-defusedxml/template
index a09539f4136..19e06abfac4 100644
--- a/srcpkgs/python3-defusedxml/template
+++ b/srcpkgs/python3-defusedxml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-defusedxml'
 pkgname=python3-defusedxml
 version=0.6.0
-revision=3
+revision=4
 wrksrc="defusedxml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7984ca88b491ae402a6b33061b57a0552fc452fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:35 -0400
Subject: [PATCH 0743/1118] python3-discogs_client: rebuild for Python 3.9

---
 srcpkgs/python3-discogs_client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-discogs_client/template b/srcpkgs/python3-discogs_client/template
index b75992655b4..99a198d18bd 100644
--- a/srcpkgs/python3-discogs_client/template
+++ b/srcpkgs/python3-discogs_client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-discogs_client'
 pkgname=python3-discogs_client
 version=2.2.2
-revision=3
+revision=4
 wrksrc="discogs-client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 66152577eba606609f8943c57c59265d6303607e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:35 -0400
Subject: [PATCH 0744/1118] python3-distlib: rebuild for Python 3.9

---
 srcpkgs/python3-distlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-distlib/template b/srcpkgs/python3-distlib/template
index e70b271197c..0e42fbde0b2 100644
--- a/srcpkgs/python3-distlib/template
+++ b/srcpkgs/python3-distlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-distlib'
 pkgname=python3-distlib
 version=0.3.1
-revision=2
+revision=3
 wrksrc="distlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 060ec5ae9ae6ccbfa1546127ef5d8e4ba5fda5e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0745/1118] python3-distro: rebuild for Python 3.9

---
 srcpkgs/python3-distro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index 4179a01a361..077fda2b81e 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
 version=1.5.0
-revision=1
+revision=2
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b3c0d8a64a5a89c1a4d9c27f9bf1d3d65259afe6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0746/1118] python3-dkimpy: rebuild for Python 3.9

---
 srcpkgs/python3-dkimpy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dkimpy/template b/srcpkgs/python3-dkimpy/template
index b6d90ccd804..5969d1ca5c8 100644
--- a/srcpkgs/python3-dkimpy/template
+++ b/srcpkgs/python3-dkimpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dkimpy'
 pkgname=python3-dkimpy
 version=1.0.0
-revision=3
+revision=4
 wrksrc="dkimpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 06e17d0b3cda17316b8b0979a79d3ea597291386 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0747/1118] python3-dnspython: rebuild for Python 3.9

---
 srcpkgs/python3-dnspython/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
index 152cee924da..3673209c402 100644
--- a/srcpkgs/python3-dnspython/template
+++ b/srcpkgs/python3-dnspython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dnspython'
 pkgname=python3-dnspython
 version=1.16.0
-revision=4
+revision=5
 wrksrc="dnspython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools unzip"

From 52cd0afcc35362bb0c3fecb94b636ad6d4225035 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0748/1118] python3-docker: rebuild for Python 3.9

---
 srcpkgs/python3-docker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template
index 2e27bfdfa76..4d4094a2b6e 100644
--- a/srcpkgs/python3-docker/template
+++ b/srcpkgs/python3-docker/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docker'
 pkgname=python3-docker
 version=4.3.1
-revision=2
+revision=3
 wrksrc="docker-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a0bc6048e5a7e8cc4c3b14bfcc37f69825c5c47f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0749/1118] python3-docker-pycreds: rebuild for Python 3.9

---
 srcpkgs/python3-docker-pycreds/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-docker-pycreds/template b/srcpkgs/python3-docker-pycreds/template
index 1217660e685..8a790a57beb 100644
--- a/srcpkgs/python3-docker-pycreds/template
+++ b/srcpkgs/python3-docker-pycreds/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docker-pycreds'
 pkgname=python3-docker-pycreds
 version=0.4.0
-revision=3
+revision=4
 wrksrc="docker-pycreds-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 347ad6e76ac1ade399679ea8c542211fae8a3204 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0750/1118] python3-dockerpty: rebuild for Python 3.9

---
 srcpkgs/python3-dockerpty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dockerpty/template b/srcpkgs/python3-dockerpty/template
index 2ad010f0b10..980ebd13c58 100644
--- a/srcpkgs/python3-dockerpty/template
+++ b/srcpkgs/python3-dockerpty/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dockerpty'
 pkgname=python3-dockerpty
 version=0.4.1
-revision=5
+revision=6
 wrksrc="dockerpty-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 636998c179b588ace7e11079db0ba466f30999ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0751/1118] python3-docopt: rebuild for Python 3.9

---
 srcpkgs/python3-docopt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-docopt/template b/srcpkgs/python3-docopt/template
index 46be2c428d2..553ac4d2e1a 100644
--- a/srcpkgs/python3-docopt/template
+++ b/srcpkgs/python3-docopt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docopt'
 pkgname=python3-docopt
 version=0.6.2
-revision=6
+revision=7
 wrksrc="docopt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6e355ae54bc786d4702e1b1f7f287e4316ac807d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:36 -0400
Subject: [PATCH 0752/1118] python3-dominate: rebuild for Python 3.9

---
 srcpkgs/python3-dominate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dominate/template b/srcpkgs/python3-dominate/template
index 225d5042db1..b297bc948fb 100644
--- a/srcpkgs/python3-dominate/template
+++ b/srcpkgs/python3-dominate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dominate'
 pkgname=python3-dominate
 version=2.5.2
-revision=2
+revision=3
 wrksrc="dominate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1c803bf7a990617102dd29195aa6fe179ea7852f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:37 -0400
Subject: [PATCH 0753/1118] python3-dulwich: rebuild for Python 3.9

---
 srcpkgs/python3-dulwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-dulwich/template b/srcpkgs/python3-dulwich/template
index 438c8f56db6..14abdb26feb 100644
--- a/srcpkgs/python3-dulwich/template
+++ b/srcpkgs/python3-dulwich/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-dulwich'
 pkgname=python3-dulwich
 version=0.19.14
-revision=3
+revision=4
 wrksrc="dulwich-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 60877ce4085ce6120256c48fb8a1badd03269772 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:37 -0400
Subject: [PATCH 0754/1118] python3-ecdsa: rebuild for Python 3.9

---
 srcpkgs/python3-ecdsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
index f7482a0a04a..3de4d1e4a44 100644
--- a/srcpkgs/python3-ecdsa/template
+++ b/srcpkgs/python3-ecdsa/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ecdsa'
 pkgname=python3-ecdsa
 version=0.14.1
-revision=4
+revision=5
 wrksrc="ecdsa-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 96ff4182f4abbd3aee21b1055d1738ab960354fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:37 -0400
Subject: [PATCH 0755/1118] python3-editor: rebuild for Python 3.9

---
 srcpkgs/python3-editor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-editor/template b/srcpkgs/python3-editor/template
index e714db9894d..e329df8af9d 100644
--- a/srcpkgs/python3-editor/template
+++ b/srcpkgs/python3-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-editor'
 pkgname=python3-editor
 version=1.0.4
-revision=3
+revision=4
 wrksrc="python-editor-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From aaa219b6d8ab9fa8b4884ae849d4a6df8d71e36f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:37 -0400
Subject: [PATCH 0756/1118] python3-efl: rebuild for Python 3.9

---
 srcpkgs/python3-efl/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-efl/template b/srcpkgs/python3-efl/template
index 9b377eb63dc..bddfb373625 100644
--- a/srcpkgs/python3-efl/template
+++ b/srcpkgs/python3-efl/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-efl'
 pkgname=python3-efl
 version=1.23.0
-revision=3
+revision=4
 wrksrc=python-efl-${version}
 build_style=python3-module
 pycompile_module="efl"
-hostmakedepends="pkg-config python3-devel"
+hostmakedepends="pkg-config python3-devel python3-Cython"
 makedepends="efl-devel python-dbus-devel"
 depends="python3-dbus"
 short_desc="Python3 bindings for Enlightenment Foundation Libraries"
@@ -15,6 +15,20 @@ homepage="http://enlightenment.org"
 distfiles="http://download.enlightenment.org/rel/bindings/python/python-efl-${version}.tar.xz"
 checksum=2bdef4153e3df2ed3edef9f1ebb4554054405425247a9fabb3c784b48232d69b
 
+post_extract() {
+	# Pre-generated cython output is incompatible with Python 3.9
+	rm -f efl/elementary/__init__.c efl/evas/efl.evas.c \
+		efl/utils/{conversions,logger,deprecated}.c \
+		efl/emotion/efl.emotion.c efl/eo/efl.eo.c \
+		efl/ecore/efl.ecore.c efl/edje/efl.edje.c \
+		efl/dbus_mainloop/efl.dbus_mainloop.c \
+		efl/ethumb/efl.ethumb{,_client}.c \
+		efl/ecore_input/efl.ecore_input.c \
+		efl/edje_edit/efl.edje_edit.c \
+		efl/ecore_con/efl.ecore_con.c \
+		efl/ecore_x/efl.ecore_x.c
+}
+
 pre_build() {
 	# any higher optimization level and gcc OOMs on i686 (even -Os)
 	case "$XBPS_TARGET_MACHINE" in

From ddf6714b703b97a6bc8ada92f616dddbf72b1a65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:37 -0400
Subject: [PATCH 0757/1118] python3-elementpath: rebuild for Python 3.9

---
 srcpkgs/python3-elementpath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template
index ebfddd82a31..58166e98310 100644
--- a/srcpkgs/python3-elementpath/template
+++ b/srcpkgs/python3-elementpath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-elementpath'
 pkgname=python3-elementpath
 version=2.0.3
-revision=1
+revision=2
 wrksrc=elementpath-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 641a0d0bc06f6e9c44097983d9f9155c4db2bdbd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:37 -0400
Subject: [PATCH 0758/1118] python3-empy: rebuild for Python 3.9

---
 srcpkgs/python3-empy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-empy/template b/srcpkgs/python3-empy/template
index 0ce3edb677e..7cbd77f52f2 100644
--- a/srcpkgs/python3-empy/template
+++ b/srcpkgs/python3-empy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-empy'
 pkgname=python3-empy
 version=3.3.4
-revision=3
+revision=4
 wrksrc="empy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 24a183752d82c975724f1bd5d8367a964b8e76fe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:37 -0400
Subject: [PATCH 0759/1118] python3-entrypoints: rebuild for Python 3.9

---
 srcpkgs/python3-entrypoints/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-entrypoints/template b/srcpkgs/python3-entrypoints/template
index 85c910e46c1..eb3318811dc 100644
--- a/srcpkgs/python3-entrypoints/template
+++ b/srcpkgs/python3-entrypoints/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-entrypoints'
 pkgname=python3-entrypoints
 version=0.3
-revision=3
+revision=4
 wrksrc="entrypoints-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 49fa57f066328603739caac8740aeb54e7928111 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0760/1118] python3-envdir: rebuild for Python 3.9

---
 srcpkgs/python3-envdir/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-envdir/template b/srcpkgs/python3-envdir/template
index 65975f4a61c..c1d3e392587 100644
--- a/srcpkgs/python3-envdir/template
+++ b/srcpkgs/python3-envdir/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-envdir'
 pkgname=python3-envdir
 version=1.0.1
-revision=4
+revision=5
 wrksrc="envdir-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a89a5818c1d83f6d0be2510a6b2e4e1b350d6fb9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0761/1118] python3-enzyme: rebuild for Python 3.9

---
 srcpkgs/python3-enzyme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-enzyme/template b/srcpkgs/python3-enzyme/template
index 4fb13e7aa27..0aa833ee0c7 100644
--- a/srcpkgs/python3-enzyme/template
+++ b/srcpkgs/python3-enzyme/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-enzyme'
 pkgname=python3-enzyme
 version=0.4.1
-revision=3
+revision=4
 wrksrc="enzyme-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f6aa7e614547fb42c7214eaf31ed3cb269363317 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0762/1118] python3-esprima: rebuild for Python 3.9

---
 srcpkgs/python3-esprima/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-esprima/template b/srcpkgs/python3-esprima/template
index c4163c1d805..d8c6b016f42 100644
--- a/srcpkgs/python3-esprima/template
+++ b/srcpkgs/python3-esprima/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-esprima'
 pkgname=python3-esprima
 version=4.0.1
-revision=3
+revision=4
 create_wrksrc=yes
 build_wrksrc="esprima-${version}"
 build_style=python3-module

From 4aa44a86f6b3966421bf9b7947dff73b465e642f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0763/1118] python3-etesync: rebuild for Python 3.9

---
 srcpkgs/python3-etesync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-etesync/template b/srcpkgs/python3-etesync/template
index 0de36a75d10..b16ac0fd8ac 100644
--- a/srcpkgs/python3-etesync/template
+++ b/srcpkgs/python3-etesync/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-etesync'
 pkgname=python3-etesync
 version=0.12.1
-revision=1
+revision=2
 wrksrc="etesync-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4fdf772573452b401a6bf456cfd8aae12ab51703 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0764/1118] python3-ewmh: rebuild for Python 3.9

---
 srcpkgs/python3-ewmh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ewmh/template b/srcpkgs/python3-ewmh/template
index a1b028642ae..4e295c61366 100644
--- a/srcpkgs/python3-ewmh/template
+++ b/srcpkgs/python3-ewmh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ewmh'
 pkgname=python3-ewmh
 version=0.1.6
-revision=4
+revision=5
 wrksrc="ewmh-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8a8b66b3f4cab9cd5ecf9b6eb536df4791c0eb3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0765/1118] python3-exifread: rebuild for Python 3.9

---
 srcpkgs/python3-exifread/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template
index b66e0636a71..3e90335a4b2 100644
--- a/srcpkgs/python3-exifread/template
+++ b/srcpkgs/python3-exifread/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-exifread'
 pkgname=python3-exifread
 version=2.3.1
-revision=2
+revision=3
 wrksrc="exif-py-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"

From 061e5c3605b2a98097c5d69a7eb8a142ceed6603 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0766/1118] python3-fasteners: rebuild for Python 3.9

---
 srcpkgs/python3-fasteners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template
index e5e5c7f206a..0dbad10f475 100644
--- a/srcpkgs/python3-fasteners/template
+++ b/srcpkgs/python3-fasteners/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fasteners'
 pkgname=python3-fasteners
 version=0.15
-revision=3
+revision=4
 wrksrc="fasteners-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5dfaba60585ae538b8108aba3d205c506677cada Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:38 -0400
Subject: [PATCH 0767/1118] python3-feedgenerator: rebuild for Python 3.9

---
 srcpkgs/python3-feedgenerator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-feedgenerator/template b/srcpkgs/python3-feedgenerator/template
index fa587971f01..5af4acd7353 100644
--- a/srcpkgs/python3-feedgenerator/template
+++ b/srcpkgs/python3-feedgenerator/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-feedgenerator'
 pkgname=python3-feedgenerator
 version=1.9.1
-revision=3
+revision=4
 wrksrc="feedgenerator-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a746d8c1b03698d2260d63a5647aa3ae207990bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:39 -0400
Subject: [PATCH 0768/1118] python3-filelock: rebuild for Python 3.9

---
 srcpkgs/python3-filelock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template
index 9105ff8689d..a69390e02e5 100644
--- a/srcpkgs/python3-filelock/template
+++ b/srcpkgs/python3-filelock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-filelock'
 pkgname=python3-filelock
 version=3.0.12
-revision=2
+revision=3
 wrksrc="filelock-${version}"
 build_style=python3-module
 pycompile_module="filelock.py"

From b3c8ade815d85e8c8eca89cc2a41044f8fac1022 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:39 -0400
Subject: [PATCH 0769/1118] python3-filetype: rebuild for Python 3.9

---
 srcpkgs/python3-filetype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-filetype/template b/srcpkgs/python3-filetype/template
index d9fcea8be46..3dc20eae525 100644
--- a/srcpkgs/python3-filetype/template
+++ b/srcpkgs/python3-filetype/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-filetype'
 pkgname=python3-filetype
 version=1.0.5
-revision=3
+revision=4
 wrksrc="filetype-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b9661d9d4087ca9cf3b4962337089b4fd5817b6a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:39 -0400
Subject: [PATCH 0770/1118] python3-flaky: rebuild for Python 3.9

---
 srcpkgs/python3-flaky/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-flaky/template b/srcpkgs/python3-flaky/template
index 9441a9a4322..bc460f455fa 100644
--- a/srcpkgs/python3-flaky/template
+++ b/srcpkgs/python3-flaky/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-flaky'
 pkgname=python3-flaky
 version=3.6.1
-revision=3
+revision=4
 wrksrc="flaky-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 352730427cdf1f17fd8d0ee6d05830db2b282c3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:39 -0400
Subject: [PATCH 0771/1118] python3-fuse: rebuild for Python 3.9

---
 srcpkgs/python3-fuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fuse/template b/srcpkgs/python3-fuse/template
index 918234dee10..6b39962f4e3 100644
--- a/srcpkgs/python3-fuse/template
+++ b/srcpkgs/python3-fuse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fuse'
 pkgname=python3-fuse
 version=0.3.1
-revision=5
+revision=6
 wrksrc=python-fuse-$version
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"

From 8e11ad2b4e0f11272507ce124e1a80f60113ce87 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:39 -0400
Subject: [PATCH 0772/1118] python3-future: rebuild for Python 3.9

---
 srcpkgs/python3-future/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-future/template b/srcpkgs/python3-future/template
index b51a9e5773a..6782bef15f0 100644
--- a/srcpkgs/python3-future/template
+++ b/srcpkgs/python3-future/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-future'
 pkgname=python3-future
 version=0.18.2
-revision=3
+revision=4
 wrksrc="future-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3b66f0ac17cd2bc2e63e7a40f3bf788ba7bd53c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:39 -0400
Subject: [PATCH 0773/1118] python3-fuzzyfinder: rebuild for Python 3.9

---
 srcpkgs/python3-fuzzyfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fuzzyfinder/template b/srcpkgs/python3-fuzzyfinder/template
index ee40e68ab4a..36ccf7bb8af 100644
--- a/srcpkgs/python3-fuzzyfinder/template
+++ b/srcpkgs/python3-fuzzyfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-fuzzyfinder'
 pkgname=python3-fuzzyfinder
 version=2.1.0
-revision=1
+revision=2
 wrksrc=fuzzyfinder-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 380b8f2709d2f29c7bf81c9f3423867488b1195a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:39 -0400
Subject: [PATCH 0774/1118] python3-gevent: rebuild for Python 3.9

---
 srcpkgs/python3-gevent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gevent/template b/srcpkgs/python3-gevent/template
index 2414ac8cb5a..fad5556530b 100644
--- a/srcpkgs/python3-gevent/template
+++ b/srcpkgs/python3-gevent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gevent'
 pkgname=python3-gevent
 version=1.4.0
-revision=3
+revision=4
 wrksrc="gevent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 4536a68802c1205cec3301cde797132045d41255 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0775/1118] python3-gitdb: rebuild for Python 3.9

---
 srcpkgs/python3-gitdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gitdb/template b/srcpkgs/python3-gitdb/template
index 30bb8329725..9fc299b8d80 100644
--- a/srcpkgs/python3-gitdb/template
+++ b/srcpkgs/python3-gitdb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gitdb'
 pkgname=python3-gitdb
 version=2.0.5
-revision=3
+revision=4
 wrksrc="gitdb2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a53413c21e43c3caa4593ef8a1e6d20ee0067a1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0776/1118] python3-github3: rebuild for Python 3.9

---
 srcpkgs/python3-github3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-github3/template b/srcpkgs/python3-github3/template
index 8873ca5f760..53c0b2b5f96 100644
--- a/srcpkgs/python3-github3/template
+++ b/srcpkgs/python3-github3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-github3'
 pkgname=python3-github3
 version=1.3.0
-revision=3
+revision=4
 wrksrc="github3.py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b9521e9c095d1f4f3da73b15d5624654f1379d23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0777/1118] python3-gitlab: rebuild for Python 3.9

---
 srcpkgs/python3-gitlab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gitlab/template b/srcpkgs/python3-gitlab/template
index 5c0080bc92a..8ef62b2570e 100644
--- a/srcpkgs/python3-gitlab/template
+++ b/srcpkgs/python3-gitlab/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gitlab'
 pkgname=python3-gitlab
 version=1.12.1
-revision=3
+revision=4
 wrksrc=python-gitlab-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 45f3fcfbe68b94ffeb560c633c7b83760de88729 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0778/1118] python3-gmpy2: rebuild for Python 3.9

---
 srcpkgs/python3-gmpy2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gmpy2/template b/srcpkgs/python3-gmpy2/template
index 469d33667a0..2e322329db6 100644
--- a/srcpkgs/python3-gmpy2/template
+++ b/srcpkgs/python3-gmpy2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gmpy2'
 pkgname=python3-gmpy2
 version=2.0.8
-revision=7
+revision=8
 wrksrc="gmpy2-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools

From 56afb2b1acd3283ecb60be20f06c1d22008e16a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0779/1118] python3-gnupg: rebuild for Python 3.9

---
 srcpkgs/python3-gnupg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
index fcd1fffc9f8..fcf3734f505 100644
--- a/srcpkgs/python3-gnupg/template
+++ b/srcpkgs/python3-gnupg/template
@@ -2,7 +2,7 @@
 pkgname=python3-gnupg
 _pkgname=python-gnupg
 version=0.4.6
-revision=2
+revision=3
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From aa2dcb37763b83e41c3b846afbdb0c693fe54617 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0780/1118] python3-gobject: rebuild for Python 3.9

---
 srcpkgs/python3-gobject/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 719b1fcde87..45e557faf82 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
 version=3.36.1
-revision=1
+revision=2
 wrksrc="pygobject-${version}"
 build_style=meson
 build_helper="gir"

From a25767eb542541b15a9bf84a4e60093c101cfc87 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0781/1118] python3-gogs-client: rebuild for Python 3.9

---
 srcpkgs/python3-gogs-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gogs-client/template b/srcpkgs/python3-gogs-client/template
index ce29cc9dced..5520cf06d63 100644
--- a/srcpkgs/python3-gogs-client/template
+++ b/srcpkgs/python3-gogs-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gogs-client'
 pkgname=python3-gogs-client
 version=1.0.6
-revision=5
+revision=6
 wrksrc="gogs_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 20a87fd850d6f8d10bd4b93489e10c1990a9b26b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:40 -0400
Subject: [PATCH 0782/1118] python3-google-api-core: rebuild for Python 3.9

---
 srcpkgs/python3-google-api-core/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-api-core/template b/srcpkgs/python3-google-api-core/template
index a721c4d5a56..f933a7e028b 100644
--- a/srcpkgs/python3-google-api-core/template
+++ b/srcpkgs/python3-google-api-core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-api-core'
 pkgname=python3-google-api-core
 version=1.22.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3b55399ff5350e460cf6d4c5c8f4bc61a9a397a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:41 -0400
Subject: [PATCH 0783/1118] python3-google-api-python-client: rebuild for
 Python 3.9

---
 srcpkgs/python3-google-api-python-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template
index fefe2c2d67b..10685d99dbe 100644
--- a/srcpkgs/python3-google-api-python-client/template
+++ b/srcpkgs/python3-google-api-python-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-api-python-client'
 pkgname=python3-google-api-python-client
 version=1.12.3
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f00fb4479048d9bf88b1e9fc54ba855b3414c519 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:41 -0400
Subject: [PATCH 0784/1118] python3-google-auth: rebuild for Python 3.9

---
 srcpkgs/python3-google-auth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-auth/template b/srcpkgs/python3-google-auth/template
index 5cdbedbc557..9048569a95e 100644
--- a/srcpkgs/python3-google-auth/template
+++ b/srcpkgs/python3-google-auth/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-auth'
 pkgname=python3-google-auth
 version=1.22.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-setuptools"

From 2cdbd85d8b1299f1389e8113ff18ebcb866d1ac0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:41 -0400
Subject: [PATCH 0785/1118] python3-google-auth-httplib2: rebuild for Python
 3.9

---
 srcpkgs/python3-google-auth-httplib2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-auth-httplib2/template b/srcpkgs/python3-google-auth-httplib2/template
index 539708b3e0f..08d324c2871 100644
--- a/srcpkgs/python3-google-auth-httplib2/template
+++ b/srcpkgs/python3-google-auth-httplib2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-auth-httplib2'
 pkgname=python3-google-auth-httplib2
 version=0.0.4
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-setuptools"

From 4fbd90899ff773628a7fe9f2581ee8620a022dfe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:41 -0400
Subject: [PATCH 0786/1118] python3-googleapis-common-protos: rebuild for
 Python 3.9

---
 srcpkgs/python3-googleapis-common-protos/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-googleapis-common-protos/template b/srcpkgs/python3-googleapis-common-protos/template
index 69206d31f1e..776af77144b 100644
--- a/srcpkgs/python3-googleapis-common-protos/template
+++ b/srcpkgs/python3-googleapis-common-protos/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-googleapis-common-protos'
 pkgname=python3-googleapis-common-protos
 version=1.52.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 796034c6ac6a60b8df51b59047e7af6644233e2d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:41 -0400
Subject: [PATCH 0787/1118] python3-gpg: rebuild for Python 3.9

---
 srcpkgs/python3-gpg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-gpg/template b/srcpkgs/python3-gpg/template
index 726725ea26e..a9ac107c83e 100644
--- a/srcpkgs/python3-gpg/template
+++ b/srcpkgs/python3-gpg/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-gpg'
 pkgname=python3-gpg
 version=1.10.0
-revision=5
+revision=6
 wrksrc="gpg-${version}"
 build_style=python3-module
 hostmakedepends="swig gpgme-devel python3-devel"

From d40a16600f2158c04909f22a54669dfa5419a476 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:41 -0400
Subject: [PATCH 0788/1118] python3-grako: rebuild for Python 3.9

---
 srcpkgs/python3-grako/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grako/template b/srcpkgs/python3-grako/template
index 23fe41f35f3..6ee30b92454 100644
--- a/srcpkgs/python3-grako/template
+++ b/srcpkgs/python3-grako/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grako'
 pkgname=python3-grako
 version=3.99.9
-revision=6
+revision=7
 wrksrc="grako-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 5920b820b400ed570c111b9d2ef3f2e5dad90f23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 12:22:35 -0400
Subject: [PATCH 0789/1118] python3-greenlet: update to 0.4.17.

---
 srcpkgs/python3-greenlet/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-greenlet/template b/srcpkgs/python3-greenlet/template
index 2c8bf1a0628..182cada6bed 100644
--- a/srcpkgs/python3-greenlet/template
+++ b/srcpkgs/python3-greenlet/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-greenlet'
 pkgname=python3-greenlet
-version=0.4.15
-revision=4
+version=0.4.17
+revision=1
 wrksrc="greenlet-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/python-greenlet/greenlet"
 changelog="https://raw.githubusercontent.com/python-greenlet/greenlet/master/NEWS"
 distfiles="${PYPI_SITE}/g/greenlet/greenlet-${version}.tar.gz"
-checksum=9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc
+checksum=41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b
 
 do_check() {
 	python3 setup.py test

From 74870dd840e841ddac879a026071c2c1b8e6ac26 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:41 -0400
Subject: [PATCH 0790/1118] python3-grpcio: rebuild for Python 3.9

---
 srcpkgs/python3-grpcio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index ff8934b3ce8..747e47fc422 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
 version=1.32.0
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module

From 0896c1cbc407385d035a47cca1f1836609060a7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:42 -0400
Subject: [PATCH 0791/1118] python3-grpcio-tools: rebuild for Python 3.9

---
 srcpkgs/python3-grpcio-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index 5fd2235a5ff..a7a691c867b 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
 version=1.32.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 80b922fa4dc73d90108a23977acb551133f5de19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:42 -0400
Subject: [PATCH 0792/1118] python3-guessit: rebuild for Python 3.9

---
 srcpkgs/python3-guessit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-guessit/template b/srcpkgs/python3-guessit/template
index ec5525b12d4..ededabb16e4 100644
--- a/srcpkgs/python3-guessit/template
+++ b/srcpkgs/python3-guessit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-guessit'
 pkgname=python3-guessit
 version=3.1.1
-revision=1
+revision=2
 wrksrc="guessit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 25cd8def6ebded59fa4bfba828d964d3f642a1c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:42 -0400
Subject: [PATCH 0793/1118] python3-h11: rebuild for Python 3.9

---
 srcpkgs/python3-h11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-h11/template b/srcpkgs/python3-h11/template
index 99ec82f0099..03ab54fb52a 100644
--- a/srcpkgs/python3-h11/template
+++ b/srcpkgs/python3-h11/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-h11'
 pkgname=python3-h11
 version=0.9.0
-revision=3
+revision=4
 wrksrc=h11-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ae5103a1adef5536ee96de3e5643b16f6c91ee24 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:42 -0400
Subject: [PATCH 0794/1118] python3-habanero: rebuild for Python 3.9

---
 srcpkgs/python3-habanero/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-habanero/template b/srcpkgs/python3-habanero/template
index b0b6d938a27..62a95d37dc8 100644
--- a/srcpkgs/python3-habanero/template
+++ b/srcpkgs/python3-habanero/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-habanero'
 pkgname=python3-habanero
 version=0.6.2
-revision=3
+revision=4
 wrksrc="habanero-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 92cf87a274678cb31afcee22cce09ef23449f716 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:42 -0400
Subject: [PATCH 0795/1118] python3-hiredis: rebuild for Python 3.9

---
 srcpkgs/python3-hiredis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-hiredis/template b/srcpkgs/python3-hiredis/template
index b63637037f6..20590ddf46f 100644
--- a/srcpkgs/python3-hiredis/template
+++ b/srcpkgs/python3-hiredis/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hiredis'
 pkgname=python3-hiredis
 version=1.1.0
-revision=1
+revision=2
 wrksrc="hiredis-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From f297c9beac008e061000e25424abd6488459309c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:42 -0400
Subject: [PATCH 0796/1118] python3-hoedown: rebuild for Python 3.9

---
 srcpkgs/python3-hoedown/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hoedown/template b/srcpkgs/python3-hoedown/template
index 6164ee9f32b..95843689b5b 100644
--- a/srcpkgs/python3-hoedown/template
+++ b/srcpkgs/python3-hoedown/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-hoedown'
 pkgname=python3-hoedown
 version=0.3.0
-revision=4
+revision=5
 wrksrc="hoedown-$version"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel"
 short_desc="Python3 binding for hoedown, a markdown parsing library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,3 +13,11 @@ license="MIT"
 distfiles="${PYPI_SITE}/h/hoedown/hoedown-${version}.tar.gz"
 checksum=f987998271adbba8cae3d622ebaa566d72e86f0c5af73131a819f7da6ccbeb90
 conflicts="python-hoedown>=0"
+
+post_extract() {
+	rm -f hoedownpy/hoedown.c
+}
+
+pre_build() {
+	python3 setup.py compile_cython
+}

From 49ff1840a9aae0b6d2ac16578d6122cbf2e7f736 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:42 -0400
Subject: [PATCH 0797/1118] python3-hpack: rebuild for Python 3.9

---
 srcpkgs/python3-hpack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-hpack/template b/srcpkgs/python3-hpack/template
index 7eb9889b862..c3a5ab3c20e 100644
--- a/srcpkgs/python3-hpack/template
+++ b/srcpkgs/python3-hpack/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hpack'
 pkgname=python3-hpack
 version=3.0.0
-revision=3
+revision=4
 wrksrc=hpack-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 912aecd952241964f31e1e0714cde1b07e525b35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0798/1118] python3-html5-parser: rebuild for Python 3.9

---
 srcpkgs/python3-html5-parser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
index 6b975e1dc15..f160e5893a4 100644
--- a/srcpkgs/python3-html5-parser/template
+++ b/srcpkgs/python3-html5-parser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-html5-parser'
 pkgname=python3-html5-parser
 version=0.4.9
-revision=3
+revision=4
 wrksrc="html5-parser-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config"

From 8c1d95bde6e770014a05c2527a78616d3b283210 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0799/1118] python3-html5lib: rebuild for Python 3.9

---
 srcpkgs/python3-html5lib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
index 5568ed9acdd..5db4d4d9cc7 100644
--- a/srcpkgs/python3-html5lib/template
+++ b/srcpkgs/python3-html5lib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-html5lib'
 pkgname=python3-html5lib
 version=1.0.1
-revision=4
+revision=5
 wrksrc="html5lib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 73a1370aa07c9da14fc4c041b8e127000f972b29 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0800/1118] python3-httmock: rebuild for Python 3.9

---
 srcpkgs/python3-httmock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template
index 7c8195dd3f8..db9c09060ad 100644
--- a/srcpkgs/python3-httmock/template
+++ b/srcpkgs/python3-httmock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-httmock'
 pkgname=python3-httmock
 version=1.3.0
-revision=3
+revision=4
 wrksrc="httmock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2bcabc5ebe19958210b97ad19f7bef769dfd579f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0801/1118] python3-httplib2: rebuild for Python 3.9

---
 srcpkgs/python3-httplib2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-httplib2/template b/srcpkgs/python3-httplib2/template
index 99ae7217f46..f3f1fe63a15 100644
--- a/srcpkgs/python3-httplib2/template
+++ b/srcpkgs/python3-httplib2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-httplib2'
 pkgname=python3-httplib2
 version=0.18.1
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="httplib2-${version}"
 build_style=python3-module

From 123c64b7eb02da557619f84bb3a9a0c41b5df966 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0802/1118] python3-hyper-h2: rebuild for Python 3.9

---
 srcpkgs/python3-hyper-h2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-hyper-h2/template b/srcpkgs/python3-hyper-h2/template
index bf56f8bc69d..8f8e955978b 100644
--- a/srcpkgs/python3-hyper-h2/template
+++ b/srcpkgs/python3-hyper-h2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hyper-h2'
 pkgname=python3-hyper-h2
 version=3.2.0
-revision=2
+revision=3
 wrksrc="hyper-h2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2098d03e901cee371b98f48f1952669ac353b53a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0803/1118] python3-hypercorn: update to 0.11.1

---
 srcpkgs/python3-hypercorn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index c61231d1163..e33dff0de19 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-hypercorn'
 pkgname=python3-hypercorn
-version=0.11.0
+version=0.11.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/hypercorn"
 changelog="https://gitlab.com/pgjones/hypercorn/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=1b4b3d4ddb2775bfea1c9c1dab5afffcc311f5871aed102f2d19a14478c6804a
+checksum=ce54464ee775d99a5f4c4408f3b52bf31c43057f40543aff386b790ecdc764da
 
 post_install() {
 	vlicense LICENSE

From 78dc77ac1d91701c03b7d44126157883d08a93be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0804/1118] python3-hyperframe: rebuild for Python 3.9

---
 srcpkgs/python3-hyperframe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-hyperframe/template b/srcpkgs/python3-hyperframe/template
index edae28f1acb..2ee216c1430 100644
--- a/srcpkgs/python3-hyperframe/template
+++ b/srcpkgs/python3-hyperframe/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hyperframe'
 pkgname=python3-hyperframe
 version=5.2.0
-revision=3
+revision=4
 wrksrc=hyperframe-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ed58940998b79138256c5d294bfb789f59f373ee Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:43 -0400
Subject: [PATCH 0805/1118] python3-icalendar: rebuild for Python 3.9

---
 srcpkgs/python3-icalendar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-icalendar/template b/srcpkgs/python3-icalendar/template
index 8d3514449bf..78d1433b144 100644
--- a/srcpkgs/python3-icalendar/template
+++ b/srcpkgs/python3-icalendar/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-icalendar'
 pkgname=python3-icalendar
 version=4.0.6
-revision=2
+revision=3
 wrksrc="icalendar-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a05189fdc506ce1632faf755c410c094235cbb5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0806/1118] python3-imageio: rebuild for Python 3.9

---
 srcpkgs/python3-imageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 52e5ef22d8f..608859d5371 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
 version=2.9.0
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3f6a54ed281a9f2154b0ea23365c744e79654cf4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0807/1118] python3-imagesize: rebuild for Python 3.9

---
 srcpkgs/python3-imagesize/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-imagesize/template b/srcpkgs/python3-imagesize/template
index 90a8db9fa29..71537584f75 100644
--- a/srcpkgs/python3-imagesize/template
+++ b/srcpkgs/python3-imagesize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-imagesize'
 pkgname=python3-imagesize
 version=1.1.0
-revision=3
+revision=4
 wrksrc="imagesize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 19b740ee8794e7833bfafd454c2422db81669c4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0808/1118] python3-iniconfig: rebuild for Python 3.9

---
 srcpkgs/python3-iniconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-iniconfig/template b/srcpkgs/python3-iniconfig/template
index b78ff3ce297..faffc52860a 100644
--- a/srcpkgs/python3-iniconfig/template
+++ b/srcpkgs/python3-iniconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-iniconfig'
 pkgname=python3-iniconfig
 version=1.0.1
-revision=1
+revision=2
 wrksrc="iniconfig-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e29b36d97cb93baf8e6b0db2cec0486ed2ac9e1a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0809/1118] python3-inotify: rebuild for Python 3.9

---
 srcpkgs/python3-inotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-inotify/template b/srcpkgs/python3-inotify/template
index f714203427d..69f75393576 100644
--- a/srcpkgs/python3-inotify/template
+++ b/srcpkgs/python3-inotify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-inotify'
 pkgname=python3-inotify
 version=0.9.6
-revision=5
+revision=6
 wrksrc="pyinotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ab0166f633387d2d8bc4712a35f3b5cd7975c87e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0810/1118] python3-iptools: rebuild for Python 3.9

---
 srcpkgs/python3-iptools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-iptools/template b/srcpkgs/python3-iptools/template
index 9f1107dddb0..4ea709ead32 100644
--- a/srcpkgs/python3-iptools/template
+++ b/srcpkgs/python3-iptools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-iptools'
 pkgname=python3-iptools
 version=0.7.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6bf407bc949c95cda4beedee99215f5f15793447 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0811/1118] python3-isbnlib: rebuild for Python 3.9

---
 srcpkgs/python3-isbnlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-isbnlib/template b/srcpkgs/python3-isbnlib/template
index 3ca66ed74d7..d8eaa48e2a9 100644
--- a/srcpkgs/python3-isbnlib/template
+++ b/srcpkgs/python3-isbnlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-isbnlib'
 pkgname=python3-isbnlib
 version=3.9.6
-revision=3
+revision=4
 wrksrc="isbnlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 63085d8093a3ca01ff02bd21bb8d9379609436a1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0812/1118] python3-isort: rebuild for Python 3.9

---
 srcpkgs/python3-isort/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
index 801bef84afb..67c12e9e63f 100644
--- a/srcpkgs/python3-isort/template
+++ b/srcpkgs/python3-isort/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-isort'
 pkgname=python3-isort
 version=4.3.21
-revision=3
+revision=4
 wrksrc="isort-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 66844c16917fe83c54beb511b11526dda5f578d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:44 -0400
Subject: [PATCH 0813/1118] python3-itsdangerous: rebuild for Python 3.9

---
 srcpkgs/python3-itsdangerous/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-itsdangerous/template b/srcpkgs/python3-itsdangerous/template
index 0c78a724eea..965c27163cf 100644
--- a/srcpkgs/python3-itsdangerous/template
+++ b/srcpkgs/python3-itsdangerous/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-itsdangerous'
 pkgname=python3-itsdangerous
 version=1.1.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 81a5639e64e1389774181cd6b67f9f02c35f147a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:45 -0400
Subject: [PATCH 0814/1118] python3-iwlib: rebuild for Python 3.9

---
 srcpkgs/python3-iwlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-iwlib/template b/srcpkgs/python3-iwlib/template
index daa36e7a227..d917c972e78 100644
--- a/srcpkgs/python3-iwlib/template
+++ b/srcpkgs/python3-iwlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-iwlib'
 pkgname=python3-iwlib
 version=1.7.0
-revision=4
+revision=5
 wrksrc="iwlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From af7ca2cf5d4fe2979b68e4a1a8ad68c97d089774 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:45 -0400
Subject: [PATCH 0815/1118] python3-jedi: rebuild for Python 3.9

---
 srcpkgs/python3-jedi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jedi/template b/srcpkgs/python3-jedi/template
index 1c1f12397d3..0adda2c40ca 100644
--- a/srcpkgs/python3-jedi/template
+++ b/srcpkgs/python3-jedi/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jedi'
 pkgname=python3-jedi
 version=0.17.2
-revision=3
+revision=4
 wrksrc="jedi-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 099a396e0a700425b9a1b72240bf8b83033cdc84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:45 -0400
Subject: [PATCH 0816/1118] python3-jellyfish: rebuild for Python 3.9

---
 srcpkgs/python3-jellyfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index 5d0a614c397..d852e40e355 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
 version=0.7.2
-revision=2
+revision=3
 wrksrc="jellyfish-${version}"
 build_style=python3-module
 pycompile_module="jellyfish"

From 687d4bb0a003271077e6769c2f98bc6ba8d39313 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:45 -0400
Subject: [PATCH 0817/1118] python3-jmespath: rebuild for Python 3.9

---
 srcpkgs/python3-jmespath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jmespath/template b/srcpkgs/python3-jmespath/template
index 0bcd20e6b28..236829aac1e 100644
--- a/srcpkgs/python3-jmespath/template
+++ b/srcpkgs/python3-jmespath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jmespath'
 pkgname=python3-jmespath
 version=0.10.0
-revision=2
+revision=3
 wrksrc="jmespath.py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e233e9fff41c318035ab9bb858ee58e4b3391475 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:45 -0400
Subject: [PATCH 0818/1118] python3-joblib: rebuild for Python 3.9

---
 srcpkgs/python3-joblib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-joblib/template b/srcpkgs/python3-joblib/template
index 9fb2de69eec..29ff3b7f7ba 100644
--- a/srcpkgs/python3-joblib/template
+++ b/srcpkgs/python3-joblib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-joblib'
 pkgname=python3-joblib
 version=0.17.0
-revision=1
+revision=2
 wrksrc="joblib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2027b640e0e5aa6911cb5453cfb01182367b0d61 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:45 -0400
Subject: [PATCH 0819/1118] python3-josepy: rebuild for Python 3.9

---
 srcpkgs/python3-josepy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index b69c2e24fc5..6d207f7fc01 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
 version=1.4.0
-revision=1
+revision=2
 wrksrc="josepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b1ea57e5963316b2d56d151c298fcc92cc09bb20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:45 -0400
Subject: [PATCH 0820/1118] python3-jsondiff: rebuild for Python 3.9

---
 srcpkgs/python3-jsondiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jsondiff/template b/srcpkgs/python3-jsondiff/template
index 5716587296c..7880b58ef06 100644
--- a/srcpkgs/python3-jsondiff/template
+++ b/srcpkgs/python3-jsondiff/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsondiff'
 pkgname=python3-jsondiff
 version=1.2.0
-revision=2
+revision=3
 wrksrc="jsondiff-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 807986bc2ab3be96b0edf39e500d55073410d846 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:46 -0400
Subject: [PATCH 0821/1118] python3-jsonpointer: rebuild for Python 3.9

---
 srcpkgs/python3-jsonpointer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template
index f8d27a50d6d..0b88878f690 100644
--- a/srcpkgs/python3-jsonpointer/template
+++ b/srcpkgs/python3-jsonpointer/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsonpointer'
 pkgname=python3-jsonpointer
 version=2.0
-revision=3
+revision=4
 wrksrc="jsonpointer-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4539013b1b3f032e1b8473c84f75872fdbf00334 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:46 -0400
Subject: [PATCH 0822/1118] python3-jsonrpclib: rebuild for Python 3.9

---
 srcpkgs/python3-jsonrpclib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jsonrpclib/template b/srcpkgs/python3-jsonrpclib/template
index 3cf4a83073c..6887e6aa140 100644
--- a/srcpkgs/python3-jsonrpclib/template
+++ b/srcpkgs/python3-jsonrpclib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsonrpclib'
 pkgname=python3-jsonrpclib
 version=0.4.0
-revision=3
+revision=4
 wrksrc="jsonrpclib-pelix-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 82f819a355993eb10817061ac11b9a766d3b34d8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:46 -0400
Subject: [PATCH 0823/1118] python3-jsonschema: rebuild for Python 3.9

---
 srcpkgs/python3-jsonschema/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
index 48686ae9a73..c3954b106dc 100644
--- a/srcpkgs/python3-jsonschema/template
+++ b/srcpkgs/python3-jsonschema/template
@@ -2,7 +2,7 @@
 pkgname=python3-jsonschema
 reverts="3.0.2_1"
 version=2.6.0
-revision=5
+revision=6
 wrksrc="jsonschema-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dac710c1de6b7abf91a7e7f0b4d18d84c92af7e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:46 -0400
Subject: [PATCH 0824/1118] python3-kaptan: rebuild for Python 3.9

---
 srcpkgs/python3-kaptan/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-kaptan/template b/srcpkgs/python3-kaptan/template
index c9af58bf95c..c2a0d57586d 100644
--- a/srcpkgs/python3-kaptan/template
+++ b/srcpkgs/python3-kaptan/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-kaptan'
 pkgname=python3-kaptan
 version=0.5.12
-revision=3
+revision=4
 wrksrc="kaptan-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ed101d9338a5537300a75348824ffb3a9bd45dac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:46 -0400
Subject: [PATCH 0825/1118] python3-keepalive: rebuild for Python 3.9

---
 srcpkgs/python3-keepalive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-keepalive/template b/srcpkgs/python3-keepalive/template
index 5272922253d..d9dd189ffaa 100644
--- a/srcpkgs/python3-keepalive/template
+++ b/srcpkgs/python3-keepalive/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-keepalive'
 pkgname=python3-keepalive
 version=0.5
-revision=5
+revision=6
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6ea2c6f2b532dca102148ddce08a39fff682e9f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:46 -0400
Subject: [PATCH 0826/1118] python3-keyutils: rebuild for Python 3.9

---
 srcpkgs/python3-keyutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
index 20f5a6b8e21..dae38bbae85 100644
--- a/srcpkgs/python3-keyutils/template
+++ b/srcpkgs/python3-keyutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-keyutils'
 pkgname=python3-keyutils
 version=0.6
-revision=3
+revision=4
 wrksrc=python-keyutils-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f16db6b7e913e51abed7ca92f55476c85a0f64b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:46 -0400
Subject: [PATCH 0827/1118] python3-kitchen: rebuild for Python 3.9

---
 srcpkgs/python3-kitchen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-kitchen/template b/srcpkgs/python3-kitchen/template
index 165899bfbab..390e1982ba3 100644
--- a/srcpkgs/python3-kitchen/template
+++ b/srcpkgs/python3-kitchen/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-kitchen'
 pkgname=python3-kitchen
 version=1.2.6
-revision=4
+revision=5
 wrksrc="kitchen-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0f2e5a24178505088eb2f90d969640c26bc2cb8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0828/1118] python3-kiwisolver: rebuild for Python 3.9

---
 srcpkgs/python3-kiwisolver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-kiwisolver/template b/srcpkgs/python3-kiwisolver/template
index cbabfa84931..e2d483ea9f5 100644
--- a/srcpkgs/python3-kiwisolver/template
+++ b/srcpkgs/python3-kiwisolver/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-kiwisolver'
 pkgname=python3-kiwisolver
 version=1.0.1
-revision=4
+revision=5
 wrksrc="kiwisolver-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 02aab1fa96da11b0e55b42bc3a8d75600d79a7f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0829/1118] python3-lazy-object-proxy: rebuild for Python 3.9

---
 srcpkgs/python3-lazy-object-proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template
index 5284244320a..cf606a1869f 100644
--- a/srcpkgs/python3-lazy-object-proxy/template
+++ b/srcpkgs/python3-lazy-object-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-lazy-object-proxy'
 pkgname=python3-lazy-object-proxy
 version=1.4.3
-revision=3
+revision=4
 wrksrc="lazy-object-proxy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b093b448bc91d4eeca99d1c35888e358c2e6267b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0830/1118] python3-ldap: rebuild for Python 3.9

---
 srcpkgs/python3-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
index 90d9650d89c..eae718b30d3 100644
--- a/srcpkgs/python3-ldap/template
+++ b/srcpkgs/python3-ldap/template
@@ -2,7 +2,7 @@
 pkgname=python3-ldap
 _pkgname=python-ldap
 version=3.2.0
-revision=2
+revision=3
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 34206340c3862535b7cf789f82d8a1d6b0729ddb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0831/1118] python3-ldap3: rebuild for Python 3.9

---
 srcpkgs/python3-ldap3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ldap3/template b/srcpkgs/python3-ldap3/template
index c1cabd083da..e9e55bb45de 100644
--- a/srcpkgs/python3-ldap3/template
+++ b/srcpkgs/python3-ldap3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ldap3'
 pkgname=python3-ldap3
 version=2.6.1
-revision=3
+revision=4
 wrksrc="ldap3-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 657c476a9a87bf8f0a88a518c72fd74c0b8a720e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0832/1118] python3-libarchive-c: rebuild for Python 3.9

---
 srcpkgs/python3-libarchive-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index 8ddf42fbec5..d78547276f3 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
 version=2.9
-revision=1
+revision=2
 wrksrc="libarchive-c-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f230bfe99e83f9969e45945b34fa9bd1b18c7721 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0833/1118] python3-libevdev: rebuild for Python 3.9

---
 srcpkgs/python3-libevdev/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-libevdev/template b/srcpkgs/python3-libevdev/template
index 66cfca9be9d..db27d9d67b8 100644
--- a/srcpkgs/python3-libevdev/template
+++ b/srcpkgs/python3-libevdev/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-libevdev'
 pkgname=python3-libevdev
 version=0.9
-revision=1
+revision=2
 _githash=5cc6bd17be733f87c77726fee2a6fa760f413a3e
 wrksrc="python-libevdev-${version}-${_githash}"
 build_style=python3-module

From b6bca9aaceed4d6b130e12ffd0df3b0c76fdbdc2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0834/1118] python3-libtmux: rebuild for Python 3.9

---
 srcpkgs/python3-libtmux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template
index cc704853b0e..c6363ece8bf 100644
--- a/srcpkgs/python3-libtmux/template
+++ b/srcpkgs/python3-libtmux/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-libtmux'
 pkgname=python3-libtmux
 version=0.8.1
-revision=3
+revision=4
 wrksrc="libtmux-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 99f7a3e7606bd60590f3c3ffc74e9e3b55700348 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:47 -0400
Subject: [PATCH 0835/1118] python3-llfuse: update to 1.3.7

---
 .../python3-llfuse/patches/thread_id.patch    | 36 +++++++++++++++++++
 srcpkgs/python3-llfuse/template               | 15 +++++---
 2 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/python3-llfuse/patches/thread_id.patch

diff --git a/srcpkgs/python3-llfuse/patches/thread_id.patch b/srcpkgs/python3-llfuse/patches/thread_id.patch
new file mode 100644
index 00000000000..7f19db512f9
--- /dev/null
+++ b/srcpkgs/python3-llfuse/patches/thread_id.patch
@@ -0,0 +1,36 @@
+From https://github.com/python-llfuse/python-llfuse/issues/28
+
+diff --git src/fuse_api.pxi src/fuse_api.pxi
+index 48bda30..1d803de 100644
+--- src/fuse_api.pxi
++++ src/fuse_api.pxi
+@@ -11,6 +11,9 @@ the terms of the GNU LGPL.
+ 
+ '''
+ 
++from libc.stdint cimport intptr_t
++
++
+ def listdir(path):
+     '''Like `os.listdir`, but releases the GIL.
+ 
+@@ -382,6 +385,7 @@ ctypedef struct worker_data_t:
+ cdef void* worker_start(void* data) with gil:
+     cdef worker_data_t *wd
+     cdef int res
++    cdef intptr_t tid
+     global exc_info
+ 
+     wd = <worker_data_t*> data
+@@ -393,8 +397,9 @@ cdef void* worker_start(void* data) with gil:
+         session_loop(wd.buf, wd.bufsize)
+     except:
+         fuse_session_exit(session)
+-        log.error('FUSE worker thread %d terminated with exception, '
+-                  'aborting processing', wd.thread_id)
++        tid = wd.thread_id
++        log.error('FUSE worker thread %p terminated with exception, '
++                  'aborting processing', tid)
+         res = pthread_mutex_lock(&exc_info_mutex)
+         if res != 0:
+             log.error('pthread_mutex_lock failed with %s',
diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
index 305924d199a..9ee6facd060 100644
--- a/srcpkgs/python3-llfuse/template
+++ b/srcpkgs/python3-llfuse/template
@@ -1,15 +1,20 @@
 # Template file for 'python3-llfuse'
 pkgname=python3-llfuse
-version=1.3.6
-revision=2
+version=1.3.7
+revision=1
 wrksrc="llfuse-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools pkg-config"
+hostmakedepends="python3-setuptools python3-Cython pkg-config"
 makedepends="python3-devel fuse-devel attr-devel"
 depends="python3"
 short_desc="Python3 bindings for the low level FUSE API"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/python-llfuse/python-llfuse"
-distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.bz2"
-checksum=31a267f7ec542b0cd62e0f1268e1880fdabf3f418ec9447def99acfa6eff2ec9
+distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.gz"
+checksum=95b750303735fdba836a46b3066e102ae74b9707c1e43581bb17329769340054
+
+pre_build() {
+	rm src/llfuse.c
+	python3 setup.py build_cython
+}

From 3e57c8f6f779e70082385cb8f2c23182d1a9f76b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:48 -0400
Subject: [PATCH 0836/1118] python3-logbook: rebuild for Python 3.9

---
 srcpkgs/python3-logbook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-logbook/template b/srcpkgs/python3-logbook/template
index 70567d94d55..aab27f27e2d 100644
--- a/srcpkgs/python3-logbook/template
+++ b/srcpkgs/python3-logbook/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-logbook'
 pkgname=python3-logbook
 version=1.5.3
-revision=1
+revision=2
 wrksrc="logbook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel python3-Cython"

From 11a430e8bd95a69f57e49a6c4f03a9b8b26bb9b5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:48 -0400
Subject: [PATCH 0837/1118] python3-logfury: rebuild for Python 3.9

---
 srcpkgs/python3-logfury/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-logfury/template b/srcpkgs/python3-logfury/template
index cad07a8cb88..b718e762ff2 100644
--- a/srcpkgs/python3-logfury/template
+++ b/srcpkgs/python3-logfury/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-logfury'
 pkgname=python3-logfury
 version=0.1.2
-revision=6
+revision=7
 wrksrc="logfury-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6c8d18cfd8045e6a564ce4897c27128a85e35384 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:48 -0400
Subject: [PATCH 0838/1118] python3-lz4: rebuild for Python 3.9

---
 srcpkgs/python3-lz4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-lz4/template b/srcpkgs/python3-lz4/template
index 29edfbcd8b0..caefedb411f 100644
--- a/srcpkgs/python3-lz4/template
+++ b/srcpkgs/python3-lz4/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-lz4'
 pkgname=python3-lz4
 version=2.1.6
-revision=4
+revision=5
 wrksrc="lz4-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools python3-pkgconfig"

From 2075e959cf53fa63718fc805463eec462cff3ba5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:48 -0400
Subject: [PATCH 0839/1118] python3-magic: rebuild for Python 3.9

---
 srcpkgs/python3-magic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-magic/template b/srcpkgs/python3-magic/template
index 3adb458996d..fb4c324dc86 100644
--- a/srcpkgs/python3-magic/template
+++ b/srcpkgs/python3-magic/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-magic'
 pkgname=python3-magic
 version=0.4.18
-revision=3
+revision=4
 wrksrc=python-magic-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 732e4b0b7c4ba62724dd621105c1a4d7ed5cc036 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:48 -0400
Subject: [PATCH 0840/1118] python3-marisa-trie: rebuild for Python 3.9

---
 srcpkgs/python3-marisa-trie/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
index ab26456bd5b..288e5650df1 100644
--- a/srcpkgs/python3-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-marisa-trie'
 pkgname=python3-marisa-trie
 version=0.7.5
-revision=4
+revision=5
 wrksrc="marisa-trie-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel"
 short_desc="Static memory-efficient Trie-like structures (Python3)"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
@@ -14,6 +14,11 @@ changelog="https://raw.githubusercontent.com/pytries/marisa-trie/master/CHANGES.
 distfiles="${PYPI_SITE}/m/marisa-trie/marisa-trie-${version}.tar.gz"
 checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
 
+pre_build() {
+	rm -f src/marisa_trie.cpp
+	cython src/*.pyx src/*.pxd --cplus
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 02702c4003341ce665d1886484c6b50f7498a7a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:48 -0400
Subject: [PATCH 0841/1118] python3-markdown2: rebuild for Python 3.9

---
 srcpkgs/python3-markdown2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-markdown2/template b/srcpkgs/python3-markdown2/template
index b263ff0979f..a79bc5fee6d 100644
--- a/srcpkgs/python3-markdown2/template
+++ b/srcpkgs/python3-markdown2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-markdown2'
 pkgname=python3-markdown2
 version=2.3.8
-revision=3
+revision=4
 wrksrc=python-markdown2-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 15438f50295223209f93013a0c61e2317faf5bad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:48 -0400
Subject: [PATCH 0842/1118] python3-matplotlib: rebuild for Python 3.9

---
 srcpkgs/python3-matplotlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index 586562eeb73..eb39817da88 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
 version=3.3.2
-revision=1
+revision=2
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"

From 5541a4eb4ccf20dddd403c16ef8cd75f26ed803f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0843/1118] python3-matrix-nio: rebuild for Python 3.9

---
 srcpkgs/python3-matrix-nio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-matrix-nio/template b/srcpkgs/python3-matrix-nio/template
index e0d57c76eb7..f819fbd2c17 100644
--- a/srcpkgs/python3-matrix-nio/template
+++ b/srcpkgs/python3-matrix-nio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-matrix-nio'
 pkgname=python3-matrix-nio
 version=0.15.1
-revision=1
+revision=2
 wrksrc="matrix-nio-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f9f021d1989cbda95c8fd7d592ff62cb5da1ffad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0844/1118] python3-mccabe: rebuild for Python 3.9

---
 srcpkgs/python3-mccabe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template
index 58b382f72c4..8f7efe4d78f 100644
--- a/srcpkgs/python3-mccabe/template
+++ b/srcpkgs/python3-mccabe/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mccabe'
 pkgname=python3-mccabe
 version=0.6.1
-revision=4
+revision=5
 wrksrc="mccabe-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From eff7830f3170daa5d0a2dc8f92c64c3a4ac45218 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0845/1118] python3-mechanize: rebuild for Python 3.9

---
 srcpkgs/python3-mechanize/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
index d6b8f7d764d..0d73fc8766f 100644
--- a/srcpkgs/python3-mechanize/template
+++ b/srcpkgs/python3-mechanize/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mechanize'
 pkgname=python3-mechanize
 version=0.4.3
-revision=5
+revision=6
 wrksrc="mechanize-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 28beb5a56435f7f02db7a65f8eecb09879c8b379 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0846/1118] python3-miniupnpc: rebuild for Python 3.9

---
 srcpkgs/python3-miniupnpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-miniupnpc/template b/srcpkgs/python3-miniupnpc/template
index 4331ce7e85e..e048910b4e5 100644
--- a/srcpkgs/python3-miniupnpc/template
+++ b/srcpkgs/python3-miniupnpc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-miniupnpc'
 pkgname=python3-miniupnpc
 version=2.0.2
-revision=4
+revision=5
 wrksrc="miniupnpc-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3c66a87e3e59f0f3819de166c3b896fcd9d37b45 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0847/1118] python3-misaka: rebuild for Python 3.9

---
 srcpkgs/python3-misaka/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-misaka/template b/srcpkgs/python3-misaka/template
index 6580b2ed512..05530b99c46 100644
--- a/srcpkgs/python3-misaka/template
+++ b/srcpkgs/python3-misaka/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-misaka'
 pkgname=python3-misaka
 version=2.1.1
-revision=1
+revision=2
 wrksrc=misaka-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From cbccae2a99238f076a1c47d7f306362768f36ca4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0848/1118] python3-mistune: rebuild for Python 3.9

---
 srcpkgs/python3-mistune/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
index 9a7f9826e0a..d090f265beb 100644
--- a/srcpkgs/python3-mistune/template
+++ b/srcpkgs/python3-mistune/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mistune'
 pkgname=python3-mistune
 version=0.8.4
-revision=3
+revision=4
 wrksrc="mistune-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0573dc9ab69a51e432003ac4461c4ffd65738056 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0849/1118] python3-more-itertools: rebuild for Python 3.9

---
 srcpkgs/python3-more-itertools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 116e86e04c5..da0f10049e6 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
 version=8.5.0
-revision=1
+revision=2
 wrksrc="more-itertools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d55aa814fbdc4779aaeaf885b3c7e04fab323584 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:49 -0400
Subject: [PATCH 0850/1118] python3-mpd2: rebuild for Python 3.9

---
 srcpkgs/python3-mpd2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mpd2/template b/srcpkgs/python3-mpd2/template
index 794212831f7..29ecea48b68 100644
--- a/srcpkgs/python3-mpd2/template
+++ b/srcpkgs/python3-mpd2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpd2'
 pkgname=python3-mpd2
 version=1.0.0
-revision=3
+revision=4
 wrksrc=python-mpd2-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7febb3ef3d85a639f0cab3cb4b2de2041efe0191 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:50 -0400
Subject: [PATCH 0851/1118] python3-mpdnotify: rebuild for Python 3.9

---
 srcpkgs/python3-mpdnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mpdnotify/template b/srcpkgs/python3-mpdnotify/template
index 7f3fafe2e9f..4943cecd06e 100644
--- a/srcpkgs/python3-mpdnotify/template
+++ b/srcpkgs/python3-mpdnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpdnotify'
 pkgname=python3-mpdnotify
 version=1.0
-revision=1
+revision=2
 wrksrc=mpdnotify-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Pillow python3-mpd2"

From 3482e8d9f9c2aaf73e0533093891e2ee4fd2a604 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:50 -0400
Subject: [PATCH 0852/1118] python3-mpi4py: rebuild for Python 3.9

---
 srcpkgs/python3-mpi4py/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template
index dc67bc1916f..200b4135851 100644
--- a/srcpkgs/python3-mpi4py/template
+++ b/srcpkgs/python3-mpi4py/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpi4py'
 pkgname=python3-mpi4py
 version=3.0.3
-revision=1
+revision=2
 wrksrc="mpi4py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran openmpi"

From f3a1de5e66cee42f9482dfddde5f0ec09ead4579 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:50 -0400
Subject: [PATCH 0853/1118] python3-mpmath: rebuild for Python 3.9

---
 srcpkgs/python3-mpmath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mpmath/template b/srcpkgs/python3-mpmath/template
index 69b5cd3bca7..4e3ea5953a3 100644
--- a/srcpkgs/python3-mpmath/template
+++ b/srcpkgs/python3-mpmath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mpmath'
 pkgname=python3-mpmath
 version=1.1.0
-revision=3
+revision=4
 wrksrc="mpmath-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4e0516e98bfa370715ee416d726087bce2e1db60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:50 -0400
Subject: [PATCH 0854/1118] python3-msgpack: rebuild for Python 3.9

---
 srcpkgs/python3-msgpack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
index f6f5f17be58..dbcf1068f6d 100644
--- a/srcpkgs/python3-msgpack/template
+++ b/srcpkgs/python3-msgpack/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-msgpack'
 pkgname=python3-msgpack
 version=1.0.0
-revision=3
+revision=4
 wrksrc="msgpack-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dc296e16d83bcfffe517a346a09f092b76505d46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:50 -0400
Subject: [PATCH 0855/1118] python3-msoffcrypto-tool: rebuild for Python 3.9

---
 srcpkgs/python3-msoffcrypto-tool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-msoffcrypto-tool/template b/srcpkgs/python3-msoffcrypto-tool/template
index 6400d96a868..4741ec40836 100644
--- a/srcpkgs/python3-msoffcrypto-tool/template
+++ b/srcpkgs/python3-msoffcrypto-tool/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-msoffcrypto-tool'
 pkgname=python3-msoffcrypto-tool
 version=4.11.0
-revision=1
+revision=2
 wrksrc="msoffcrypto-tool-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4d73868bb8b639676d0cd2a6de4bb340d9c7b34e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:50 -0400
Subject: [PATCH 0856/1118] python3-mtranslate: rebuild for Python 3.9

---
 srcpkgs/python3-mtranslate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mtranslate/template b/srcpkgs/python3-mtranslate/template
index e15e054b90e..613d1e96c4d 100644
--- a/srcpkgs/python3-mtranslate/template
+++ b/srcpkgs/python3-mtranslate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mtranslate'
 pkgname=python3-mtranslate
 version=1.6
-revision=3
+revision=4
 wrksrc="mtranslate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 26ea22104069a829eb7f96b090d78460a24f8664 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:50 -0400
Subject: [PATCH 0857/1118] python3-multidict: rebuild for Python 3.9

---
 srcpkgs/python3-multidict/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template
index 111cd6f683d..1a805d98207 100644
--- a/srcpkgs/python3-multidict/template
+++ b/srcpkgs/python3-multidict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-multidict'
 pkgname=python3-multidict
 version=4.7.6
-revision=1
+revision=2
 wrksrc="multidict-${version}"
 build_style=python3-module
 hostmakedepends="python3-Cython python3-setuptools"

From 5b60b104558808635f13835ccf69966d4d2a46c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0858/1118] python3-musicbrainzngs: rebuild for Python 3.9

---
 srcpkgs/python3-musicbrainzngs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
index 6bb7c93ce6a..8de5f65f12d 100644
--- a/srcpkgs/python3-musicbrainzngs/template
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-musicbrainzngs'
 pkgname=python3-musicbrainzngs
 version=0.6
-revision=6
+revision=7
 wrksrc="musicbrainzngs-${version}"
 build_style="python3-module"
 hostmakedepends="python3-devel"

From eeb0a76da06195484bb4e63c0de9c7b735edcfa2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0859/1118] python3-mygpoclient: rebuild for Python 3.9

---
 srcpkgs/python3-mygpoclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mygpoclient/template b/srcpkgs/python3-mygpoclient/template
index 4e7c97ea1b6..a3d39790977 100644
--- a/srcpkgs/python3-mygpoclient/template
+++ b/srcpkgs/python3-mygpoclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mygpoclient'
 pkgname=python3-mygpoclient
 version=1.8
-revision=4
+revision=5
 wrksrc="mygpoclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From c1bf25fae33ff2ac413e79ca8488f877135108ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0860/1118] python3-mysqlclient: rebuild for Python 3.9

---
 srcpkgs/python3-mysqlclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5685da31ab8..12b06f20d65 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=3
+revision=4
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8a8cd07aac2e3d2076630d2fa618c71aa2c70bbd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0861/1118] python3-namedlist: rebuild for Python 3.9

---
 srcpkgs/python3-namedlist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-namedlist/template b/srcpkgs/python3-namedlist/template
index 1d947ec4cfd..0ecdcafe873 100644
--- a/srcpkgs/python3-namedlist/template
+++ b/srcpkgs/python3-namedlist/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-namedlist'
 pkgname=python3-namedlist
 version=1.8
-revision=2
+revision=3
 wrksrc="namedlist-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d0086a3d030f5d6c328472a4799065e6ea6440ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0862/1118] python3-natsort: rebuild for Python 3.9

---
 srcpkgs/python3-natsort/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-natsort/template b/srcpkgs/python3-natsort/template
index d86211907f5..0cc3ea1e95e 100644
--- a/srcpkgs/python3-natsort/template
+++ b/srcpkgs/python3-natsort/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-natsort'
 pkgname=python3-natsort
 version=6.0.0
-revision=3
+revision=4
 wrksrc="natsort-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 57bc5e35d659120e644c80d4fcba3b10460e9732 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0863/1118] python3-nbxmpp: rebuild for Python 3.9

---
 srcpkgs/python3-nbxmpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index 583a4691a4d..bb6b13ae6ff 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
 version=1.0.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 975aad8286d7ca4b28b2487f5c5636bc6d6ab97d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0864/1118] python3-ndg_httpsclient: rebuild for Python 3.9

---
 srcpkgs/python3-ndg_httpsclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ndg_httpsclient/template b/srcpkgs/python3-ndg_httpsclient/template
index df96d0081a0..03c0861f8d9 100644
--- a/srcpkgs/python3-ndg_httpsclient/template
+++ b/srcpkgs/python3-ndg_httpsclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ndg_httpsclient'
 pkgname=python3-ndg_httpsclient
 version=0.5.1
-revision=3
+revision=4
 wrksrc="ndg_httpsclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cca1208548241a4227c46dfad7c443641e927938 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:51 -0400
Subject: [PATCH 0865/1118] python3-netaddr: rebuild for Python 3.9

---
 srcpkgs/python3-netaddr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-netaddr/template b/srcpkgs/python3-netaddr/template
index 4d6d5161b34..9454e7453dd 100644
--- a/srcpkgs/python3-netaddr/template
+++ b/srcpkgs/python3-netaddr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-netaddr'
 pkgname=python3-netaddr
 version=0.7.19
-revision=4
+revision=5
 wrksrc="netaddr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 57573a5604ada57b160b6f338c0f1bb44c90e29c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0866/1118] python3-networkx: rebuild for Python 3.9

---
 srcpkgs/python3-networkx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-networkx/template b/srcpkgs/python3-networkx/template
index 1260ac3a468..e0c7b03fe59 100644
--- a/srcpkgs/python3-networkx/template
+++ b/srcpkgs/python3-networkx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-networkx'
 pkgname=python3-networkx
 version=2.5
-revision=1
+revision=2
 wrksrc="networkx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools unzip"

From 32440fd2c8b4f0a1baeba4e5e62b721910a3ab3c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0867/1118] python3-nose-random: rebuild for Python 3.9

---
 srcpkgs/python3-nose-random/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-nose-random/template b/srcpkgs/python3-nose-random/template
index 987220ff5cd..5cace38cb89 100644
--- a/srcpkgs/python3-nose-random/template
+++ b/srcpkgs/python3-nose-random/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nose-random'
 pkgname=python3-nose-random
 version=1.0.0
-revision=2
+revision=3
 wrksrc="nose-random-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c9c232afe201cf088a7b3b438d57299b4d965089 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0868/1118] python3-nose2: rebuild for Python 3.9

---
 srcpkgs/python3-nose2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-nose2/template b/srcpkgs/python3-nose2/template
index a21c090356b..d1f95c3e373 100644
--- a/srcpkgs/python3-nose2/template
+++ b/srcpkgs/python3-nose2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-nose2'
 pkgname=python3-nose2
 version=0.8.0
-revision=3
+revision=4
 wrksrc="nose2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 609442796721b9d150389ccf3782e3c2cddbcea6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0869/1118] python3-npyscreen: rebuild for Python 3.9

---
 srcpkgs/python3-npyscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-npyscreen/template b/srcpkgs/python3-npyscreen/template
index f9d29115bfe..1ecfe7c3bda 100644
--- a/srcpkgs/python3-npyscreen/template
+++ b/srcpkgs/python3-npyscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-npyscreen'
 pkgname=python3-npyscreen
 version=4.10.5.1
-revision=3
+revision=4
 wrksrc="npyscreen-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 28a53d0b345d925aaa3e8eef2941dd1fd91f6d3e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0870/1118] python3-ntplib: rebuild for Python 3.9

---
 srcpkgs/python3-ntplib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ntplib/template b/srcpkgs/python3-ntplib/template
index 811c9b25e9d..6de96f22702 100644
--- a/srcpkgs/python3-ntplib/template
+++ b/srcpkgs/python3-ntplib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ntplib'
 pkgname=python3-ntplib
 version=0.3.4
-revision=1
+revision=2
 wrksrc="ntplib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 15a1141ea3c4c3dc5941cdd04b63130e5d19d4c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0871/1118] python3-numexpr: rebuild for Python 3.9

---
 srcpkgs/python3-numexpr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
index c19b5149018..ce056126e98 100644
--- a/srcpkgs/python3-numexpr/template
+++ b/srcpkgs/python3-numexpr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numexpr'
 pkgname=python3-numexpr
 version=2.7.0
-revision=3
+revision=4
 wrksrc="numexpr-${version}"
 build_style=python3-module
 build_helper=numpy

From d5dfc5f7123bacb37b7ce4523a2ec34f912e1d07 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0872/1118] python3-numpy: rebuild for Python 3.9

---
 srcpkgs/python3-numpy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 759899d8e7b..d5bb09aa63c 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
 version=1.19.2
-revision=1
+revision=2
 wrksrc="numpy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython gcc-fortran"

From 576ba06d694828e2f1e14aea3f41bee36f957065 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:52 -0400
Subject: [PATCH 0873/1118] python3-numpy-stl: rebuild for Python 3.9

---
 srcpkgs/python3-numpy-stl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template
index 1693e0b6f2c..2876d3266ad 100644
--- a/srcpkgs/python3-numpy-stl/template
+++ b/srcpkgs/python3-numpy-stl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-numpy-stl'
 pkgname=python3-numpy-stl
 version=2.11.2
-revision=1
+revision=2
 wrksrc="numpy-stl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 368f03391780d24fd5ec01e20d5ac6b9617fb1b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH 0874/1118] python3-oauth2client: rebuild for Python 3.9

---
 srcpkgs/python3-oauth2client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-oauth2client/template b/srcpkgs/python3-oauth2client/template
index c0b36a0c10d..940ae74c971 100644
--- a/srcpkgs/python3-oauth2client/template
+++ b/srcpkgs/python3-oauth2client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oauth2client'
 pkgname=python3-oauth2client
 version=4.1.3
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2d36448c7dd8e969a2190f55eaf7f3cc99ef027d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH 0875/1118] python3-oauthlib: rebuild for Python 3.9

---
 srcpkgs/python3-oauthlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-oauthlib/template b/srcpkgs/python3-oauthlib/template
index 642950f51e4..6bc69a2f9b7 100644
--- a/srcpkgs/python3-oauthlib/template
+++ b/srcpkgs/python3-oauthlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oauthlib'
 pkgname=python3-oauthlib
 version=3.1.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 766d3a80782265d51d431adbcd8a788f6fca9fa7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH 0876/1118] python3-occ: rebuild for Python 3.9, fix breakage
 with occt

---
 srcpkgs/python3-occ/patches/occt.patch | 48 ++++++++++++++++++++++++++
 srcpkgs/python3-occ/template           |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-occ/patches/occt.patch

diff --git a/srcpkgs/python3-occ/patches/occt.patch b/srcpkgs/python3-occ/patches/occt.patch
new file mode 100644
index 00000000000..1dc133471c7
--- /dev/null
+++ b/srcpkgs/python3-occ/patches/occt.patch
@@ -0,0 +1,48 @@
+Patch for occt-7.4.0p1. See disussion at
+https://github.com/tpaviot/pythonocc-core/issues/870
+
+Index: pythonocc-core-7.4.0/src/SWIG_files/wrapper/BOPAlgo.i
+===================================================================
+--- src/SWIG_files/wrapper/BOPAlgo.i
++++ src/SWIG_files/wrapper/BOPAlgo.i
+@@ -632,17 +632,6 @@ class BOPAlgo_Tools {
+ 	:rtype: void") PerformCommonBlocks;
+ 		static void PerformCommonBlocks (const BOPDS_IndexedDataMapOfPaveBlockListOfInteger & theMBlocks,const opencascade::handle<NCollection_BaseAllocator> & theAllocator,BOPDS_PDS & pDS,const opencascade::handle<IntTools_Context> & theContext = opencascade::handle<IntTools_Context>());
+ 
+-		/****************** TreatCompound ******************/
+-		%feature("compactdefaultargs") TreatCompound;
+-		%feature("autodoc", "* Collect in the output list recursively all non-compound subshapes of the first level of the given shape theS. If a shape presents in the map theMFence it is skipped. All shapes put in the output are also added into theMFence.
+-	:param theS:
+-	:type theS: TopoDS_Shape
+-	:param theMFence:
+-	:type theMFence: TopTools_MapOfShape
+-	:param theLS:
+-	:type theLS: TopTools_ListOfShape
+-	:rtype: void") TreatCompound;
+-		static void TreatCompound (const TopoDS_Shape & theS,TopTools_MapOfShape & theMFence,TopTools_ListOfShape & theLS);
+ 
+ 		/****************** WiresToFaces ******************/
+ 		%feature("compactdefaultargs") WiresToFaces;
+Index: pythonocc-core-7.4.0/src/SWIG_files/wrapper/BOPTools.i
+===================================================================
+--- src/SWIG_files/wrapper/BOPTools.i
++++ src/SWIG_files/wrapper/BOPTools.i
+@@ -776,6 +776,18 @@ class BOPTools_AlgoTools {
+ 	:rtype: int") Sense;
+ 		static Standard_Integer Sense (const TopoDS_Face & theF1,const TopoDS_Face & theF2,const opencascade::handle<IntTools_Context> & theContext);
+ 
++		/****************** TreatCompound ******************/
++		%feature("compactdefaultargs") TreatCompound;
++		%feature("autodoc", "* Collect in the output list recursively all non-compound subshapes of the first level of the given shape theS. If a shape presents in the map theMFence it is skipped. All shapes put in the output are also added into theMFence.
++	:param theS:
++	:type theS: TopoDS_Shape
++	:param theLS:
++	:type theLS: TopTools_ListOfShape
++	:param theMFence:
++	:type theMFence: TopTools_MapOfShape
++	:rtype: void") TreatCompound;
++		static void TreatCompound (const TopoDS_Shape & theS,TopTools_ListOfShape & theLS, TopTools_MapOfShape * theMFence);
++
+ 		/****************** UpdateVertex ******************/
+ 		%feature("compactdefaultargs") UpdateVertex;
+ 		%feature("autodoc", "* @name Updating the vertex Update the tolerance value for vertex <aV> taking into account the fact that <aV> lays on the curve <aIC>
diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 945f80cdc23..42d742ba0af 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
 version=7.4.0
-revision=1
+revision=2
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake

From 3f21e43b43c30fe1b4e158ae855e8485897944b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH 0877/1118] python3-olefile: rebuild for Python 3.9

---
 srcpkgs/python3-olefile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-olefile/template b/srcpkgs/python3-olefile/template
index 2f787215a92..d76ec0ee8ad 100644
--- a/srcpkgs/python3-olefile/template
+++ b/srcpkgs/python3-olefile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-olefile'
 pkgname=python3-olefile
 version=0.46
-revision=3
+revision=4
 wrksrc="olefile-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"

From 255dddb1a253bfafa863400dc2b785a024bf995c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH 0878/1118] python3-opcua: rebuild for Python 3.9

---
 srcpkgs/python3-opcua/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-opcua/template b/srcpkgs/python3-opcua/template
index 01390c39d8b..cd46a30efcc 100644
--- a/srcpkgs/python3-opcua/template
+++ b/srcpkgs/python3-opcua/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-opcua'
 pkgname=python3-opcua
 version=0.98.12
-revision=1
+revision=2
 wrksrc="opcua-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 41d021f8f75d9bd859590965ba9cdd42bfcbfa3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH 0879/1118] python3-orocos-kdl: rebuild for Python 3.9, fix
 breakage with sip

---
 srcpkgs/python3-orocos-kdl/patches/sip.patch | 113 +++++++++++++++++++
 srcpkgs/python3-orocos-kdl/template          |   2 +-
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-orocos-kdl/patches/sip.patch

diff --git a/srcpkgs/python3-orocos-kdl/patches/sip.patch b/srcpkgs/python3-orocos-kdl/patches/sip.patch
new file mode 100644
index 00000000000..1aae42273fc
--- /dev/null
+++ b/srcpkgs/python3-orocos-kdl/patches/sip.patch
@@ -0,0 +1,113 @@
+From f8d488cad733d2c2c6fe6911dc2e72e014ad0002 Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Fri, 26 Jun 2020 17:04:12 +0200
+Subject: [PATCH] Declare assignment operator private for SIP (Closes: #260)
+
+Starting with v4.19.23 SIP expects a working operator= or one marked
+private explicitly. All classes in this PR have a reference member
+(&chain) resulting in the compiler deleting the default assignment
+operator. This PR makes this known to SIP as well.
+
+[ Rebased against release version by Andrew J. Hesford. ]
+---
+diff -ur python_orocos_kdl/PyKDL.orig/dynamics.sip python_orocos_kdl/PyKDL/dynamics.sip
+--- python_orocos_kdl/PyKDL.orig/dynamics.sip	2020-10-08 09:41:13.830476720 -0400
++++ python_orocos_kdl/PyKDL/dynamics.sip	2020-10-08 09:41:58.875476576 -0400
+@@ -72,4 +72,6 @@
+     int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
+ 	int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
+ 	int JntToGravity(const JntArray &q,JntArray &gravity);
++private:
++    ChainDynParam& operator=(const ChainDynParam&);
+ };
+diff -ur python_orocos_kdl/PyKDL.orig/kinfam.sip python_orocos_kdl/PyKDL/kinfam.sip
+--- python_orocos_kdl/PyKDL.orig/kinfam.sip	2020-10-08 09:41:13.830476720 -0400
++++ python_orocos_kdl/PyKDL/kinfam.sip	2020-10-08 09:47:26.314475457 -0400
+@@ -344,6 +344,8 @@
+     ChainFkSolverPos_recursive(const Chain& chain);
+     virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
+     virtual void updateInternalDataStructures();
++private:
++    ChainFkSolverPos_recursive& operator=(const ChainFkSolverPos_recursive&);
+ };
+ 
+ class ChainFkSolverVel_recursive : ChainFkSolverVel
+@@ -357,6 +359,8 @@
+     virtual int JntToCart(const JntArrayVel& q_in ,FrameVel& out,int
+     segmentNr=-1 );
+     virtual void updateInternalDataStructures();
++private:
++    ChainFkSolverVel_recursive& operator=(const ChainFkSolverVel_recursive&);
+ };
+ 
+ class ChainIkSolverPos : SolverI {
+@@ -392,6 +396,8 @@
+     
+     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+     virtual void updateInternalDataStructures();
++private:
++    ChainIkSolverPos_NR& operator=(const ChainIkSolverPos_NR&);
+ };
+ 
+ class ChainIkSolverPos_NR_JL : ChainIkSolverPos
+@@ -407,6 +413,8 @@
+     
+     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+     virtual void updateInternalDataStructures();
++private:
++    ChainIkSolverPos_NR_JL& operator=(const ChainIkSolverPos_NR_JL&);
+ };
+ 
+ class ChainIkSolverVel_pinv : ChainIkSolverVel
+@@ -420,6 +428,8 @@
+         
+     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
+     virtual void updateInternalDataStructures();
++private:
++    ChainIkSolverVel_pinv& operator=(const ChainIkSolverVel_pinv&);
+ };
+ 
+ class ChainIkSolverVel_wdls : ChainIkSolverVel
+@@ -506,6 +516,8 @@
+ 
+     void setLambda(const double& lambda);
+ 
++private:
++    ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
+ };
+ 
+ 
+@@ -520,6 +532,8 @@
+ 
+     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+     virtual void updateInternalDataStructures();
++private:
++    ChainIkSolverPos_LMA& operator=(const ChainIkSolverPos_LMA&);
+ };
+ 
+ 
+@@ -546,6 +560,8 @@
+     const JntArray& getOptPos()const /Factory/;
+ 
+     const double& getAlpha()const /Factory/;
++private:
++    ChainIkSolverVel_pinv_nso& operator=(const ChainIkSolverVel_pinv_nso&);
+ };
+ 
+ class ChainIkSolverVel_pinv_givens : ChainIkSolverVel
+@@ -559,6 +575,8 @@
+         
+     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
+     virtual void updateInternalDataStructures();
++private:
++    ChainIkSolverVel_pinv_givens& operator=(const ChainIkSolverVel_pinv_givens&);
+ };
+ 
+ class ChainJntToJacSolver : SolverI
+@@ -571,4 +589,6 @@
+     ChainJntToJacSolver(const Chain& chain);
+     int JntToJac(const JntArray& q_in,Jacobian& jac);
+     virtual void updateInternalDataStructures();
++private:
++    ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
+ };
diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template
index 85b573b2fa4..20341a9fd17 100644
--- a/srcpkgs/python3-orocos-kdl/template
+++ b/srcpkgs/python3-orocos-kdl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-orocos-kdl'
 pkgname=python3-orocos-kdl
 version=1.4.0
-revision=2
+revision=3
 wrksrc=orocos_kinematics_dynamics-${version}
 build_wrksrc=python_orocos_kdl
 build_style=cmake

From 4843cdbcf027a18bcf3cf9232b7123ca001f666b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH 0880/1118] python3-owm: rebuild for Python 3.9

---
 srcpkgs/python3-owm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-owm/template b/srcpkgs/python3-owm/template
index acdb960ab45..3ee67ad0b48 100644
--- a/srcpkgs/python3-owm/template
+++ b/srcpkgs/python3-owm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-owm'
 pkgname=python3-owm
 version=2.10
-revision=2
+revision=3
 wrksrc="pyowm-${version}"
 build_style=python3-module
 pycompile_module="pyowm"

From bd0a9165a83c8dbf187246ca80cdb64ae8d08e7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0881/1118] python3-pafy: rebuild for Python 3.9

---
 srcpkgs/python3-pafy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
index 1165626f76e..e9f5c9db1ef 100644
--- a/srcpkgs/python3-pafy/template
+++ b/srcpkgs/python3-pafy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pafy'
 pkgname=python3-pafy
 version=0.5.5
-revision=2
+revision=3
 wrksrc="pafy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools youtube-dl"

From 36e68cbee67fb043763dc648049fa96f1451a03c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0882/1118] python3-pam: rebuild for Python 3.9

---
 srcpkgs/python3-pam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template
index a95dbeb95d6..2cb58192ad1 100644
--- a/srcpkgs/python3-pam/template
+++ b/srcpkgs/python3-pam/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pam'
 pkgname=python3-pam
 version=1.8.4
-revision=4
+revision=5
 wrksrc="python-pam-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2f8259132aa01f0b0157e7fbfda191aed036eb31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0883/1118] python3-pandas: rebuild for Python 3.9

---
 srcpkgs/python3-pandas/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 9865e5a8ba3..bb7849c0004 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
 version=1.1.2
-revision=1
+revision=2
 wrksrc="pandas-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"
@@ -14,6 +14,10 @@ homepage="https://pandas.pydata.org/"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
 checksum=89b68faeffd114cef8d41c6469c094c610228238254c59190659cd91ceb862bb
 
+post_patch() {
+	vsed -i setup.py -e '/extra_compile_args = /s/"-Werror"//'
+}
+
 post_install() {
 	vlicense LICENSE
 }

From ec62e66d9125e35c641abee03e945fb618b1f939 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0884/1118] python3-pandas-msgpack: rebuild for Python 3.9

---
 srcpkgs/python3-pandas-msgpack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pandas-msgpack/template b/srcpkgs/python3-pandas-msgpack/template
index 9fd08e74718..5eed8fc3c76 100644
--- a/srcpkgs/python3-pandas-msgpack/template
+++ b/srcpkgs/python3-pandas-msgpack/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandas-msgpack'
 pkgname=python3-pandas-msgpack
 version=0.1.5
-revision=1
+revision=2
 wrksrc="pandas-msgpack"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 1b17c877b48b56a98d3b54baf9794f35427b0e05 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0885/1118] python3-pandocfilters: rebuild for Python 3.9

---
 srcpkgs/python3-pandocfilters/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template
index a15bce30b1e..442e461e7c6 100644
--- a/srcpkgs/python3-pandocfilters/template
+++ b/srcpkgs/python3-pandocfilters/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pandocfilters'
 pkgname=python3-pandocfilters
 version=1.4.2
-revision=4
+revision=5
 wrksrc="pandocfilters-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6046768a60508f474149937d1f855f024be919d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0886/1118] python3-paramiko: rebuild for Python 3.9

---
 srcpkgs/python3-paramiko/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-paramiko/template b/srcpkgs/python3-paramiko/template
index 125abe44fba..300ab8643fd 100644
--- a/srcpkgs/python3-paramiko/template
+++ b/srcpkgs/python3-paramiko/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-paramiko'
 pkgname=python3-paramiko
 version=2.7.1
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 44dd57079539afbfda9eaf7e3a5cf7f004c95a64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0887/1118] python3-parse: rebuild for Python 3.9

---
 srcpkgs/python3-parse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-parse/template b/srcpkgs/python3-parse/template
index fce303974b8..cab14fe4f0d 100644
--- a/srcpkgs/python3-parse/template
+++ b/srcpkgs/python3-parse/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-parse'
 pkgname=python3-parse
 version=1.12.0
-revision=3
+revision=4
 wrksrc="parse-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8ebcde78573bfccc353c2b42961445058068efe8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:54 -0400
Subject: [PATCH 0888/1118] python3-parso: rebuild for Python 3.9

---
 srcpkgs/python3-parso/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template
index e2f26e23b48..cb2c8e20105 100644
--- a/srcpkgs/python3-parso/template
+++ b/srcpkgs/python3-parso/template
@@ -2,7 +2,7 @@
 pkgname=python3-parso
 reverts="0.8.0_1"
 version=0.7.1
-revision=1
+revision=2
 wrksrc="parso-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7fb8d293b07027293531fc11b2a0f02c8dca0ed8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0889/1118] python3-passlib: rebuild for Python 3.9

---
 srcpkgs/python3-passlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-passlib/template b/srcpkgs/python3-passlib/template
index cb40fdfef9a..29927bd8125 100644
--- a/srcpkgs/python3-passlib/template
+++ b/srcpkgs/python3-passlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-passlib'
 pkgname=python3-passlib
 version=1.7.1
-revision=4
+revision=5
 wrksrc="passlib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dd681b1c59fb3176e069c337b12fc295e5094ad4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0890/1118] python3-pathspec: rebuild for Python 3.9

---
 srcpkgs/python3-pathspec/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pathspec/template b/srcpkgs/python3-pathspec/template
index 19859fb496e..421aaf078b5 100644
--- a/srcpkgs/python3-pathspec/template
+++ b/srcpkgs/python3-pathspec/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pathspec'
 pkgname=python3-pathspec
 version=0.6.0
-revision=3
+revision=4
 wrksrc="pathspec-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c493b98445d8ea619d204a4fdf0c089638844f19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0891/1118] python3-pathtools: rebuild for Python 3.9

---
 srcpkgs/python3-pathtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pathtools/template b/srcpkgs/python3-pathtools/template
index 8e5c7a04026..6c4376596f5 100644
--- a/srcpkgs/python3-pathtools/template
+++ b/srcpkgs/python3-pathtools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pathtools'
 pkgname=python3-pathtools
 version=0.1.2
-revision=3
+revision=4
 wrksrc="pathtools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 76c63ceacd49594bf7f688364172e1e6a5d5df86 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0892/1118] python3-pbkdf2: rebuild for Python 3.9

---
 srcpkgs/python3-pbkdf2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pbkdf2/template b/srcpkgs/python3-pbkdf2/template
index fd02716b302..7be3e926b71 100644
--- a/srcpkgs/python3-pbkdf2/template
+++ b/srcpkgs/python3-pbkdf2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pbkdf2'
 pkgname=python3-pbkdf2
 version=1.3
-revision=5
+revision=6
 wrksrc="pbkdf2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 048600bc597eb34716dcd632e2748642ae0c182d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0893/1118] python3-pdfrw: rebuild for Python 3.9

---
 srcpkgs/python3-pdfrw/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pdfrw/template b/srcpkgs/python3-pdfrw/template
index eb32d8c379b..a99d11f452c 100644
--- a/srcpkgs/python3-pdfrw/template
+++ b/srcpkgs/python3-pdfrw/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pdfrw'
 pkgname=python3-pdfrw
 version=0.4
-revision=4
+revision=5
 wrksrc="pdfrw-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3c0621bf68258089b349527b1d8ac5dd0306f045 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0894/1118] python3-peewee: rebuild for Python 3.9

---
 srcpkgs/python3-peewee/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
index ba282e88a90..e5c123cc3ac 100644
--- a/srcpkgs/python3-peewee/template
+++ b/srcpkgs/python3-peewee/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-peewee'
 pkgname=python3-peewee
 version=3.13.3
-revision=2
+revision=3
 wrksrc="peewee-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"

From 1bfdbbbf0fd04a9026797ab5d8249bd9cb6ce76a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0895/1118] python3-pexpect: rebuild for Python 3.9

---
 srcpkgs/python3-pexpect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template
index 0d6548021c2..00a1bb1b5ec 100644
--- a/srcpkgs/python3-pexpect/template
+++ b/srcpkgs/python3-pexpect/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pexpect'
 pkgname=python3-pexpect
 version=4.7.0
-revision=3
+revision=4
 wrksrc="pexpect-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 74ce7981cc80da0e500997214f54b20784e5ed1b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:55 -0400
Subject: [PATCH 0896/1118] python3-pgmigrate: rebuild for Python 3.9

---
 srcpkgs/python3-pgmigrate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pgmigrate/template b/srcpkgs/python3-pgmigrate/template
index d72812a21b5..3b459536e8d 100644
--- a/srcpkgs/python3-pgmigrate/template
+++ b/srcpkgs/python3-pgmigrate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pgmigrate'
 pkgname=python3-pgmigrate
 version=1.0.5
-revision=3
+revision=4
 wrksrc="pgmigrate-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a014074cb77512452e14240f824cdcdeee469c4d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0897/1118] python3-picamera: rebuild for Python 3.9

---
 srcpkgs/python3-picamera/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-picamera/template b/srcpkgs/python3-picamera/template
index 07bb4e7bb45..bfbbfb2b2b2 100644
--- a/srcpkgs/python3-picamera/template
+++ b/srcpkgs/python3-picamera/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-picamera'
 pkgname=python3-picamera
 version=1.13
-revision=3
+revision=4
 wrksrc="picamera-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c7adca8688e58e26d52dbc4b494194a9e036397b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0898/1118] python3-pickleshare: rebuild for Python 3.9

---
 srcpkgs/python3-pickleshare/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pickleshare/template b/srcpkgs/python3-pickleshare/template
index 86a09d0b562..3f569f5bf4c 100644
--- a/srcpkgs/python3-pickleshare/template
+++ b/srcpkgs/python3-pickleshare/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pickleshare'
 pkgname=python3-pickleshare
 version=0.7.5
-revision=3
+revision=4
 wrksrc="pickleshare-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 007b5fbd80ef807c51fde09ebfbce84329c62ab0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0899/1118] python3-pillow-simd: rebuild for Python 3.9

---
 srcpkgs/python3-pillow-simd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pillow-simd/template b/srcpkgs/python3-pillow-simd/template
index 9e72fb8f5ce..6b0f0eee9e0 100644
--- a/srcpkgs/python3-pillow-simd/template
+++ b/srcpkgs/python3-pillow-simd/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pillow-simd'
 pkgname=python3-pillow-simd
 version=7.1.2
-revision=1
+revision=2
 archs="x86_64*"
 wrksrc="pillow-simd-${version}"
 build_style=python3-module

From 4e135078bcba1a2a6a32cb3649e1319ec3443649 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0900/1118] python3-pip: rebuild for Python 3.9

---
 srcpkgs/python3-pip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index fcfc36e4c17..37512254bc2 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
 version=20.2.3
-revision=2
+revision=3
 wrksrc="pip-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 468eaa8bfff153211f58f5d170e21256404871e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0901/1118] python3-pipenv: rebuild for Python 3.9

---
 srcpkgs/python3-pipenv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index cb295b593a8..23b298c1988 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
 version=2020.8.13
-revision=2
+revision=3
 wrksrc="pipenv-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 67c4ebdd6f4fc51c418cbb8cefee41105b914cce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0902/1118] python3-pipx: rebuild for Python 3.9

---
 srcpkgs/python3-pipx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 09f5e8b73ff..cb8c8aaada7 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
 version=0.15.5.1
-revision=2
+revision=3
 wrksrc="pipx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9cda4cb417382a944ffb6dd292146a7bd6baf91b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0903/1118] python3-pivy: update to 0.6.5

---
 srcpkgs/python3-pivy/patches/73cd928f.patch | 36 ---------------------
 srcpkgs/python3-pivy/template               | 12 +++----
 2 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/python3-pivy/patches/73cd928f.patch

diff --git a/srcpkgs/python3-pivy/patches/73cd928f.patch b/srcpkgs/python3-pivy/patches/73cd928f.patch
deleted file mode 100644
index edff803822a..00000000000
--- a/srcpkgs/python3-pivy/patches/73cd928f.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 73cd928fe1a9c2abbe6f28844a7fc695ad11d7cf Mon Sep 17 00:00:00 2001
-From: Peter Lama <peterldev94@gmail.com>
-Date: Fri, 24 Aug 2018 17:25:47 -0700
-Subject: [PATCH] Fix issue #39: PyUnicode_AsUTF8 returns const char*
-
-Even with python 2, it doesn't seem like char* is needed
-
---- Inventor/nodes/SoMarkerSet.i
-+++ Inventor/nodes/SoMarkerSet.i
-@@ -5,7 +5,7 @@
-         short WIDTH, HEIGHT;
-         size.getValue(WIDTH, HEIGHT);
-         short BYTEWIDTH = (WIDTH + 7) / 2;
--        char* coin_marker;
-+        const char* coin_marker;
- #ifdef PY_2
-         if (PyString_Check(string))
-         {
-@@ -49,4 +49,4 @@
-         delete[] bitmapbytes;
-         bitmapbytes = NULL;
-     }
--}
-\ No newline at end of file
-+}
---- Inventor/sensors/SoSensor.i
-+++ Inventor/sensors/SoSensor.i
-@@ -4,7 +4,7 @@ SoSensorPythonCB(void * data, SoSensor * sensor)
- {
-   PyGILState_STATE gil = PyGILState_Ensure();
-   swig_type_info * swig_type = 0;
--  char * sensor_cast_name = NULL;
-+  const char * sensor_cast_name = NULL;
-   PyObject * func, * arglist;
-   PyObject * result, * pysensor;
- 
diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index d58767f93d4..40570303769 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,17 +1,17 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
-version=0.6.4
-revision=2
-wrksrc="Coin3D-pivy-a84100beff22"
+version=0.6.5
+revision=1
+wrksrc="pivy-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel swig"
 makedepends="python3-devel coin3-devel qt5-devel"
 short_desc="Python3 bindings for the high-level 3D graphics library Coin"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="0BSD"
-homepage="https://bitbucket.org/Coin3D/pivy"
-distfiles="https://bitbucket.org/Coin3D/pivy/get/${version}.tar.gz"
-checksum=2ee684dbf0f52c05b491c5423013fd82e679614bffee23641485248c8a790c4e
+homepage="https://github.com/coin3d/pivy"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=16f2e339e5c59a6438266abe491013a20f53267e596850efad1559564a2c1719
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*);;

From 259fe22131c4d533cc7fd3ddf26914960e82b329 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:56 -0400
Subject: [PATCH 0904/1118] python3-pkgconfig: rebuild for Python 3.9

---
 srcpkgs/python3-pkgconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template
index e150a3b31db..2f3b7a9cae7 100644
--- a/srcpkgs/python3-pkgconfig/template
+++ b/srcpkgs/python3-pkgconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pkgconfig'
 pkgname=python3-pkgconfig
 version=1.5.1
-revision=3
+revision=4
 wrksrc="pkgconfig-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 46968fa312ca8f0509576d60370fe4ac0ee6ba57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:57 -0400
Subject: [PATCH 0905/1118] python3-pluggy: rebuild for Python 3.9

---
 srcpkgs/python3-pluggy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index 8f0c7c7bd24..c0b4b1c2bc8 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
 version=0.13.1
-revision=4
+revision=5
 wrksrc="pluggy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 355678d9e2ae152022ff42be2a61bebaa6f3c989 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:57 -0400
Subject: [PATCH 0906/1118] python3-podcastparser: rebuild for Python 3.9

---
 srcpkgs/python3-podcastparser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-podcastparser/template b/srcpkgs/python3-podcastparser/template
index 4a180bb349b..71342f79e08 100644
--- a/srcpkgs/python3-podcastparser/template
+++ b/srcpkgs/python3-podcastparser/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-podcastparser'
 pkgname=python3-podcastparser
 version=0.6.5
-revision=2
+revision=3
 wrksrc="podcastparser-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 0b031709a39b83e7744ac029582a868a4189f45f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:57 -0400
Subject: [PATCH 0907/1118] python3-polib: rebuild for Python 3.9

---
 srcpkgs/python3-polib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-polib/template b/srcpkgs/python3-polib/template
index a4ca2d745fa..593cdd9703f 100644
--- a/srcpkgs/python3-polib/template
+++ b/srcpkgs/python3-polib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-polib'
 pkgname=python3-polib
 version=1.1.0
-revision=3
+revision=4
 wrksrc="polib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 23cf40bb1d8b12731bc1e9368caefd73312c1fb7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:57 -0400
Subject: [PATCH 0908/1118] python3-portend: rebuild for Python 3.9

---
 srcpkgs/python3-portend/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-portend/template b/srcpkgs/python3-portend/template
index 8d975df5dc0..6cf1d03eda6 100644
--- a/srcpkgs/python3-portend/template
+++ b/srcpkgs/python3-portend/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-portend'
 pkgname=python3-portend
 version=2.5
-revision=3
+revision=4
 wrksrc="portend-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bf71c50da51618587e829874b49f33b542aa2e3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:57 -0400
Subject: [PATCH 0909/1118] python3-prctl: rebuild for Python 3.9

---
 srcpkgs/python3-prctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
index f81cceb6735..358d89bc230 100644
--- a/srcpkgs/python3-prctl/template
+++ b/srcpkgs/python3-prctl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prctl'
 pkgname=python3-prctl
 version=1.7
-revision=5
+revision=6
 wrksrc=python-prctl-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools libcap-devel"

From ff0560a5ebed7e24526050832e76f3afc06cae9b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:57 -0400
Subject: [PATCH 0910/1118] python3-progress: rebuild for Python 3.9

---
 srcpkgs/python3-progress/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template
index 35cff7a258f..ee6b3ffc932 100644
--- a/srcpkgs/python3-progress/template
+++ b/srcpkgs/python3-progress/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-progress'
 pkgname=python3-progress
 version=1.5
-revision=3
+revision=4
 wrksrc="progress-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 53e9287310bbd2dab82adc662840815f397e0822 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:57 -0400
Subject: [PATCH 0911/1118] python3-prometheus_client: rebuild for Python 3.9

---
 srcpkgs/python3-prometheus_client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-prometheus_client/template b/srcpkgs/python3-prometheus_client/template
index b69a3d1f297..3cc9d7bfdaa 100644
--- a/srcpkgs/python3-prometheus_client/template
+++ b/srcpkgs/python3-prometheus_client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prometheus_client'
 pkgname=python3-prometheus_client
 version=0.7.1
-revision=3
+revision=4
 wrksrc="prometheus_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7957cd801d8ec09249465010a27d879f85f88b8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0912/1118] python3-proselint: rebuild for Python 3.9

---
 srcpkgs/python3-proselint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-proselint/template b/srcpkgs/python3-proselint/template
index 54af756372c..3a35c699861 100644
--- a/srcpkgs/python3-proselint/template
+++ b/srcpkgs/python3-proselint/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-proselint'
 pkgname=python3-proselint
 version=0.10.2
-revision=3
+revision=4
 wrksrc="proselint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3f9d9ddc71b4fae5f55abe9471360e98819053df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0913/1118] python3-protobuf: rebuild for Python 3.9

---
 srcpkgs/python3-protobuf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index 02d07ec6bf5..c5857caa2fb 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-protobuf'
 pkgname=python3-protobuf
 version=3.13.0
-revision=2
+revision=3
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-wheel"

From 02451ba0540f4a0c5b2cb7260c9b7ddf13921a66 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0914/1118] python3-psycopg2: rebuild for Python 3.9

---
 srcpkgs/python3-psycopg2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-psycopg2/template b/srcpkgs/python3-psycopg2/template
index 0758b992bae..ebd3b6b1241 100644
--- a/srcpkgs/python3-psycopg2/template
+++ b/srcpkgs/python3-psycopg2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-psycopg2'
 pkgname=python3-psycopg2
 version=2.8.3
-revision=3
+revision=4
 wrksrc="psycopg2-${version}"
 build_style=python3-module
 # Require postgresql-libs-devel to find executable: pg_config

From e2e14f5c87f9439cbb6f25ac8b34c29f95f16548 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0915/1118] python3-ptyprocess: rebuild for Python 3.9

---
 srcpkgs/python3-ptyprocess/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ptyprocess/template b/srcpkgs/python3-ptyprocess/template
index b6d93378e7d..b56ec204556 100644
--- a/srcpkgs/python3-ptyprocess/template
+++ b/srcpkgs/python3-ptyprocess/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ptyprocess'
 pkgname=python3-ptyprocess
 version=0.6.0
-revision=3
+revision=4
 wrksrc="ptyprocess-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 455118cfedb47bbb72d44a50e5e8d08afde3251d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0916/1118] python3-pure-protobuf: rebuild for Python 3.9

---
 srcpkgs/python3-pure-protobuf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pure-protobuf/template b/srcpkgs/python3-pure-protobuf/template
index 70edc67f6b7..3be6c1600f8 100644
--- a/srcpkgs/python3-pure-protobuf/template
+++ b/srcpkgs/python3-pure-protobuf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pure-protobuf'
 pkgname=python3-pure-protobuf
 version=2.0.1
-revision=1
+revision=2
 wrksrc=protobuf-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 371a6d893328f442d297fd371ecff26c1d335cab Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0917/1118] python3-py: rebuild for Python 3.9

---
 srcpkgs/python3-py/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-py/template b/srcpkgs/python3-py/template
index 5bfcb42bc88..7232bbd5e65 100644
--- a/srcpkgs/python3-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-py'
 pkgname=python3-py
 version=1.9.0
-revision=2
+revision=3
 wrksrc="py-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 76ee7e4d37ec0c8c0ba9c03cee2454e0af438ea5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0918/1118] python3-pyFFTW: rebuild for Python 3.9

---
 srcpkgs/python3-pyFFTW/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyFFTW/template b/srcpkgs/python3-pyFFTW/template
index d748a352fa1..7b322145956 100644
--- a/srcpkgs/python3-pyFFTW/template
+++ b/srcpkgs/python3-pyFFTW/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyFFTW'
 pkgname=python3-pyFFTW
 version=0.12.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"

From 52c4659e5c3f9e872713a0e89da7772931a94dff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:58 -0400
Subject: [PATCH 0919/1118] python3-pyPEG2: rebuild for Python 3.9

---
 srcpkgs/python3-pyPEG2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyPEG2/template b/srcpkgs/python3-pyPEG2/template
index 4dc0e88f21a..d936155e7bb 100644
--- a/srcpkgs/python3-pyPEG2/template
+++ b/srcpkgs/python3-pyPEG2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyPEG2'
 pkgname=python3-pyPEG2
 version=2.15.2
-revision=6
+revision=7
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 679c66f8db1de2fc3caadfc49fe9744311c6081f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:59 -0400
Subject: [PATCH 0920/1118] python3-pyacoustid: rebuild for Python 3.9

---
 srcpkgs/python3-pyacoustid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyacoustid/template b/srcpkgs/python3-pyacoustid/template
index eccab8db7c2..27ef7783d5d 100644
--- a/srcpkgs/python3-pyacoustid/template
+++ b/srcpkgs/python3-pyacoustid/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyacoustid'
 pkgname=python3-pyacoustid
 version=1.1.5
-revision=4
+revision=5
 wrksrc="pyacoustid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6e9b2710641c9637079b857e36e5d303b17f5300 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:59 -0400
Subject: [PATCH 0921/1118] python3-pyaes: rebuild for Python 3.9

---
 srcpkgs/python3-pyaes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
index d48717625a8..6a047eeb6ee 100644
--- a/srcpkgs/python3-pyaes/template
+++ b/srcpkgs/python3-pyaes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyaes'
 pkgname=python3-pyaes
 version=1.6.1
-revision=4
+revision=5
 wrksrc="pyaes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 03cfc645a66e2cf61eabb4d74d66cd8be56e68fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:59 -0400
Subject: [PATCH 0922/1118] python3-pycares: rebuild for Python 3.9

---
 srcpkgs/python3-pycares/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pycares/template b/srcpkgs/python3-pycares/template
index 3c33a1091c5..036ab32b1dc 100644
--- a/srcpkgs/python3-pycares/template
+++ b/srcpkgs/python3-pycares/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycares'
 pkgname=python3-pycares
 version=3.1.1
-revision=2
+revision=3
 wrksrc="pycares-${version}"
 build_style=python3-module
 # using bundled c-ares which is patched for TTL support

From 6c2488d2d8e10423baec227f601bb4792991c123 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:59 -0400
Subject: [PATCH 0923/1118] python3-pycdio: rebuild for Python 3.9

---
 srcpkgs/python3-pycdio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pycdio/template b/srcpkgs/python3-pycdio/template
index 9151191c1f4..3697ba33362 100644
--- a/srcpkgs/python3-pycdio/template
+++ b/srcpkgs/python3-pycdio/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycdio'
 pkgname=python3-pycdio
 version=2.1.0
-revision=1
+revision=2
 wrksrc=pycdio-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools pkg-config swig"

From 6e1be0caf8fd751120c0f7dc41254e458af6c529 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:59 -0400
Subject: [PATCH 0924/1118] python3-pycountry: rebuild for Python 3.9

---
 srcpkgs/python3-pycountry/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pycountry/template b/srcpkgs/python3-pycountry/template
index 1a4ce3b65f2..40041309d28 100644
--- a/srcpkgs/python3-pycountry/template
+++ b/srcpkgs/python3-pycountry/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycountry'
 pkgname=python3-pycountry
 version=19.8.18
-revision=2
+revision=3
 wrksrc="pycountry-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 40fc890ef1b0b2d4f49fd0c7c3b8d4a393b999bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:59 -0400
Subject: [PATCH 0925/1118] python3-pycryptodomex: rebuild for Python 3.9

---
 srcpkgs/python3-pycryptodomex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template
index c75df8cb11a..0e7c5327177 100644
--- a/srcpkgs/python3-pycryptodomex/template
+++ b/srcpkgs/python3-pycryptodomex/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycryptodomex'
 pkgname=python3-pycryptodomex
 version=3.9.8
-revision=1
+revision=2
 wrksrc="pycryptodomex-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f3ebaf2d0da14bbcecdccc77583b72cc1bec2efe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:59 -0400
Subject: [PATCH 0926/1118] python3-pyelftools: rebuild for Python 3.9

---
 srcpkgs/python3-pyelftools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
index cf3013215fc..587e9b51194 100644
--- a/srcpkgs/python3-pyelftools/template
+++ b/srcpkgs/python3-pyelftools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyelftools'
 pkgname=python3-pyelftools
 version=0.25
-revision=5
+revision=6
 wrksrc="pyelftools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a73d882a2c80b099d02109934af664f501b80f0c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0927/1118] python3-pyflakes: rebuild for Python 3.9

---
 srcpkgs/python3-pyflakes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template
index 67983857755..f0a017a14bb 100644
--- a/srcpkgs/python3-pyflakes/template
+++ b/srcpkgs/python3-pyflakes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyflakes'
 pkgname=python3-pyflakes
 version=2.2.0
-revision=2
+revision=3
 wrksrc="pyflakes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From be6e869a5609190336b58d44fa31435f2a7c06b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0928/1118] python3-pygame: rebuild for Python 3.9

---
 srcpkgs/python3-pygame/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template
index ee1736245b4..c136b750713 100644
--- a/srcpkgs/python3-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-pygame'
 pkgname=python3-pygame
 version=1.9.6
-revision=3
+revision=4
 wrksrc="pygame-${version}"
 build_style=python3-module
-hostmakedepends="pkg-config python3-setuptools SDL_mixer-devel
- SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
+make_build_args="cython"
+hostmakedepends="pkg-config python3-setuptools python3-Cython
+ SDL_mixer-devel SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
 makedepends="python3-devel SDL_mixer-devel SDL_image-devel
  SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
 short_desc="Collection of Python modules for writing games (Python3)"
@@ -16,3 +17,8 @@ distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
 checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
 
 export PORTMIDI_INC_PORTTIME=1
+
+pre_build() {
+	# Remove the C source to re-cythonize, which avoids some API changes
+	rm src_c/pypm.c src_c/_sdl2/{sdl2,audio,video}.c
+}

From 09aef7619f4b9975f5abec57e9177c44fbf69391 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0929/1118] python3-pyinfra: rebuild for Python 3.9

---
 srcpkgs/python3-pyinfra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index e085cae288e..dc4a1ec9858 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
 version=1.1.2
-revision=1
+revision=2
 wrksrc="pyinfra-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 337d69f9344a8cea50c8d1c5fc5bf529048a19a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0930/1118] python3-pykka: rebuild for Python 3.9

---
 srcpkgs/python3-pykka/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pykka/template b/srcpkgs/python3-pykka/template
index d78fa350994..72eea6ad026 100644
--- a/srcpkgs/python3-pykka/template
+++ b/srcpkgs/python3-pykka/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykka'
 pkgname=python3-pykka
 version=2.0.2
-revision=2
+revision=3
 wrksrc="Pykka-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ed3fbb1e95bcbf712dce3b6455035e8e059fdd60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0931/1118] python3-pylast: rebuild for Python 3.9

---
 srcpkgs/python3-pylast/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index e74bd403f00..bae519bcb7d 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
 version=3.3.0
-revision=2
+revision=3
 wrksrc="pylast-${version}"
 build_style=python3-module
 pycompile_module="pylast"

From e1a2d32053e4994f83ac8c6a9873d880db455d94 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0932/1118] python3-pynacl: rebuild for Python 3.9

---
 srcpkgs/python3-pynacl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pynacl/template b/srcpkgs/python3-pynacl/template
index d78d92cfd69..cf1a81b0eda 100644
--- a/srcpkgs/python3-pynacl/template
+++ b/srcpkgs/python3-pynacl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynacl'
 pkgname=python3-pynacl
 version=1.3.0
-revision=4
+revision=5
 wrksrc="PyNaCl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-cffi"

From f3d802f2a0de5b631bad7e6cc0de35e270606249 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0933/1118] python3-pyopencl: rebuild for Python 3.9

---
 srcpkgs/python3-pyopencl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 6b385024105..e95b1649b74 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
 version=2020.2.2
-revision=1
+revision=2
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"

From ec7ecd9cbc23b1ea89c5f65fa46a4ca30d304d2e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:00 -0400
Subject: [PATCH 0934/1118] python3-pyotp: rebuild for Python 3.9

---
 srcpkgs/python3-pyotp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyotp/template b/srcpkgs/python3-pyotp/template
index 91118a9c597..c0053bcc620 100644
--- a/srcpkgs/python3-pyotp/template
+++ b/srcpkgs/python3-pyotp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyotp'
 pkgname=python3-pyotp
 version=2.3.0
-revision=3
+revision=4
 wrksrc="pyotp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0a89b10e8c8d36e387929c8a80d6b3d0a5c5d3c0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0935/1118] python3-pyperclip: rebuild for Python 3.9

---
 srcpkgs/python3-pyperclip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyperclip/template b/srcpkgs/python3-pyperclip/template
index 11e758320b9..12703a57348 100644
--- a/srcpkgs/python3-pyperclip/template
+++ b/srcpkgs/python3-pyperclip/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyperclip'
 pkgname=python3-pyperclip
 version=1.8.0
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc=pyperclip-${version}
 build_style=python3-module

From 48075fa0e0cd70a027f608c5aa7a49cbbb0139bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0936/1118] python3-pyqtgraph: rebuild for Python 3.9

---
 srcpkgs/python3-pyqtgraph/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template
index 6fb09733e51..0c6de465876 100644
--- a/srcpkgs/python3-pyqtgraph/template
+++ b/srcpkgs/python3-pyqtgraph/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyqtgraph'
 pkgname=python3-pyqtgraph
 version=0.10.0
-revision=5
+revision=6
 wrksrc="${pkgname#*-}-${pkgname#*-}-${version}"
 build_style=python3-module
 make_install_args="--no-compile"

From 904f003dbaeac61ab540d55d2f7cbf6d5cc13b56 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0937/1118] python3-pyrfc3339: rebuild for Python 3.9

---
 srcpkgs/python3-pyrfc3339/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyrfc3339/template b/srcpkgs/python3-pyrfc3339/template
index 331c6c4c331..1ec462102e4 100644
--- a/srcpkgs/python3-pyrfc3339/template
+++ b/srcpkgs/python3-pyrfc3339/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrfc3339'
 pkgname=python3-pyrfc3339
 version=1.1
-revision=3
+revision=4
 wrksrc="pyRFC3339-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 24011fca68207ac1ce11cc985440c1386d96e80b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0938/1118] python3-pyscard: rebuild for Python 3.9

---
 srcpkgs/python3-pyscard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template
index 05f4bf213cf..e8cf1f04954 100644
--- a/srcpkgs/python3-pyscard/template
+++ b/srcpkgs/python3-pyscard/template
@@ -2,7 +2,7 @@
 pkgname=python3-pyscard
 _pkgname=pyscard
 version=2.0.0
-revision=1
+revision=2
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools swig"

From a3416176c299186d329c610eb41bd9eebce523f8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0939/1118] python3-pyscss: rebuild for Python 3.9

---
 srcpkgs/python3-pyscss/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyscss/template b/srcpkgs/python3-pyscss/template
index bc648f3e62a..1dad6f1f4bc 100644
--- a/srcpkgs/python3-pyscss/template
+++ b/srcpkgs/python3-pyscss/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyscss'
 pkgname=python3-pyscss
 version=1.3.7
-revision=2
+revision=3
 wrksrc="pyScss-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools pcre-devel"

From 8ee2b68aec0df1e10c9b267e4160561477f15160 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0940/1118] python3-pysocks: rebuild for Python 3.9

---
 srcpkgs/python3-pysocks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pysocks/template b/srcpkgs/python3-pysocks/template
index f7b3d4f57c3..399fe375df8 100644
--- a/srcpkgs/python3-pysocks/template
+++ b/srcpkgs/python3-pysocks/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysocks'
 pkgname=python3-pysocks
 version=1.7.0
-revision=2
+revision=3
 wrksrc="PySocks-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b760e0e2b0f66af931c7c09fb1bdbef2ab756a7f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0941/1118] python3-pysol_cards: rebuild for Python 3.9

---
 srcpkgs/python3-pysol_cards/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index 93bd0c57708..f97857216d9 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysol_cards'
 pkgname=python3-pysol_cards
 version=0.10.1
-revision=1
+revision=2
 wrksrc="pysol_cards-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2407653fa7786730d70ac4e6294d621fd5c556bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:01 -0400
Subject: [PATCH 0942/1118] python3-pyspotify: rebuild for Python 3.9

---
 srcpkgs/python3-pyspotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyspotify/template b/srcpkgs/python3-pyspotify/template
index a970140c5b0..478d94a2338 100644
--- a/srcpkgs/python3-pyspotify/template
+++ b/srcpkgs/python3-pyspotify/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyspotify'
 pkgname=python3-pyspotify
 version=2.1.3
-revision=1
+revision=2
 wrksrc="pyspotify-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c8ad31895c1543cd6a1385b936e8e0bc3347dd89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:02 -0400
Subject: [PATCH 0943/1118] python3-pysrt: rebuild for Python 3.9

---
 srcpkgs/python3-pysrt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pysrt/template b/srcpkgs/python3-pysrt/template
index 4fd225c206a..2f5097e0eae 100644
--- a/srcpkgs/python3-pysrt/template
+++ b/srcpkgs/python3-pysrt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pysrt'
 pkgname=python3-pysrt
 version=1.1.2
-revision=2
+revision=3
 wrksrc="pysrt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From bb8f0c59e8f061a8bbf6f56632ee3c9bb2f7689d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:02 -0400
Subject: [PATCH 0944/1118] python3-pyte: rebuild for Python 3.9

---
 srcpkgs/python3-pyte/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
index 301e466c1b9..219dc653f9c 100644
--- a/srcpkgs/python3-pyte/template
+++ b/srcpkgs/python3-pyte/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyte'
 pkgname=python3-pyte
 version=0.8.0
-revision=4
+revision=5
 wrksrc="pyte-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cf3d1a5a2d70d70bf798aed1b428f6c53a417fb5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:02 -0400
Subject: [PATCH 0945/1118] python3-pytest: rebuild for Python 3.9

---
 srcpkgs/python3-pytest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 646b6387318..69f9b2aedcc 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest'
 pkgname=python3-pytest
 version=6.0.2
-revision=2
+revision=3
 wrksrc="pytest-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 951a3fa8d807fd1805114987b4a9f04a803c752b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:02 -0400
Subject: [PATCH 0946/1118] python3-pytest-cov: rebuild for Python 3.9

---
 srcpkgs/python3-pytest-cov/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template
index 22f6ec01299..87912eb2deb 100644
--- a/srcpkgs/python3-pytest-cov/template
+++ b/srcpkgs/python3-pytest-cov/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-cov'
 pkgname=python3-pytest-cov
 version=2.10.1
-revision=2
+revision=3
 wrksrc="pytest-cov-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dc2e8153e9bc3b56bf6cb4e92357270b752fe70e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:02 -0400
Subject: [PATCH 0947/1118] python3-pytest-fixture-config: rebuild for Python
 3.9

---
 srcpkgs/python3-pytest-fixture-config/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template
index 8829948896a..d2a7beaae13 100644
--- a/srcpkgs/python3-pytest-fixture-config/template
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -2,7 +2,7 @@
 pkgname=python3-pytest-fixture-config
 _pkgname=${pkgname#*-}
 version=1.3.0
-revision=4
+revision=5
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3a5350c35e133a46610656dcad4dc00bbacebb3f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:02 -0400
Subject: [PATCH 0948/1118] python3-pytest-mock: rebuild for Python 3.9

---
 srcpkgs/python3-pytest-mock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
index bde86441bf6..c1dc8183009 100644
--- a/srcpkgs/python3-pytest-mock/template
+++ b/srcpkgs/python3-pytest-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-mock'
 pkgname=python3-pytest-mock
 version=1.10.4
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b3a96ba77e17a41c9246a329b1e41c3c59b19ea5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:02 -0400
Subject: [PATCH 0949/1118] python3-pyudev: rebuild for Python 3.9

---
 srcpkgs/python3-pyudev/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyudev/template b/srcpkgs/python3-pyudev/template
index 8b741a5f1a5..11134b4816a 100644
--- a/srcpkgs/python3-pyudev/template
+++ b/srcpkgs/python3-pyudev/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-pyudev'
 pkgname=python3-pyudev
 version=0.21.0
-revision=4
+revision=5
 wrksrc="pyudev-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3 python3-six"
+depends="python3 python3-six eudev-libudev"
 short_desc="Python bindings to libudev (Python3)"
 maintainer="Luca Weiss <luca@z3ntu.xyz>"
 license="LGPL-2.1-or-later"

From 6a536ed6875d6e7fde4d6d4b6ed822c5a7b31413 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:03 -0400
Subject: [PATCH 0950/1118] python3-pywt: rebuild for Python 3.9

---
 srcpkgs/python3-pywt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template
index d2a28c6e98c..e5837f85be8 100644
--- a/srcpkgs/python3-pywt/template
+++ b/srcpkgs/python3-pywt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pywt'
 pkgname=python3-pywt
 version=1.1.1
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="numpy"

From 212198deeba42120d2f3571d1fa317f3e2ac05fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:03 -0400
Subject: [PATCH 0951/1118] python3-pyxattr: rebuild for Python 3.9

---
 srcpkgs/python3-pyxattr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyxattr/template b/srcpkgs/python3-pyxattr/template
index 84e27796915..61ad51014d3 100644
--- a/srcpkgs/python3-pyxattr/template
+++ b/srcpkgs/python3-pyxattr/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyxattr'
 pkgname=python3-pyxattr
 version=0.7.1
-revision=1
+revision=2
 wrksrc="pyxattr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5c2f3cfb90a77a535a3104d2ddad189b210b3fc6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:03 -0400
Subject: [PATCH 0952/1118] python3-pyzbar: rebuild for Python 3.9

---
 srcpkgs/python3-pyzbar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyzbar/template b/srcpkgs/python3-pyzbar/template
index b3cb17aacef..ce1d59993af 100644
--- a/srcpkgs/python3-pyzbar/template
+++ b/srcpkgs/python3-pyzbar/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyzbar'
 pkgname=python3-pyzbar
 version=0.1.8
-revision=3
+revision=4
 wrksrc="pyzbar-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 975001f1e61f87f8a75b1b5e8977b0dfd1e32f4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:03 -0400
Subject: [PATCH 0953/1118] python3-pyzmq: rebuild for Python 3.9

---
 srcpkgs/python3-pyzmq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template
index fae748d8754..4defa14dc46 100644
--- a/srcpkgs/python3-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyzmq'
 pkgname=python3-pyzmq
 version=19.0.2
-revision=2
+revision=3
 wrksrc="pyzmq-${version}"
 build_style=python3-module
 make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"

From 878922c835cba9533707d579f94d2ba9533aa953 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:03 -0400
Subject: [PATCH 0954/1118] python3-qrcode: rebuild for Python 3.9

---
 srcpkgs/python3-qrcode/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-qrcode/template b/srcpkgs/python3-qrcode/template
index 1d287bafa4e..81013dfba48 100644
--- a/srcpkgs/python3-qrcode/template
+++ b/srcpkgs/python3-qrcode/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-qrcode'
 pkgname=python3-qrcode
 version=6.1
-revision=3
+revision=4
 wrksrc="qrcode-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cb09e1e5e81f785087de94c3eebff92e7331e2d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:03 -0400
Subject: [PATCH 0955/1118] python3-quart: rebuild for Python 3.9

---
 srcpkgs/python3-quart/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index ce8d614db00..d58875de114 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
 version=0.13.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3675247afb1f09dad43cea623a5156094c4b834c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:03 -0400
Subject: [PATCH 0956/1118] python3-random2: rebuild for Python 3.9

---
 srcpkgs/python3-random2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-random2/template b/srcpkgs/python3-random2/template
index 6f5b4a9a719..39c64b50e15 100644
--- a/srcpkgs/python3-random2/template
+++ b/srcpkgs/python3-random2/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-random2'
 pkgname=python3-random2
 version=1.0.1
-revision=5
+revision=6
 wrksrc="random2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools unzip"

From 9b344ccca1aaa924d7eb1cc757b8bd4bfa6f41ec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0957/1118] python3-rarfile: rebuild for Python 3.9

---
 srcpkgs/python3-rarfile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-rarfile/template b/srcpkgs/python3-rarfile/template
index 071cbfbb1ad..247e8607ab6 100644
--- a/srcpkgs/python3-rarfile/template
+++ b/srcpkgs/python3-rarfile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rarfile'
 pkgname=python3-rarfile
 version=4.0
-revision=2
+revision=3
 wrksrc="rarfile-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From fed6d460af70a6580735c0d0d9d20ea7ac984f28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0958/1118] python3-raven: rebuild for Python 3.9

---
 srcpkgs/python3-raven/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-raven/template b/srcpkgs/python3-raven/template
index 831dc90aa97..b5cca718861 100644
--- a/srcpkgs/python3-raven/template
+++ b/srcpkgs/python3-raven/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-raven'
 pkgname=python3-raven
 version=6.10.0
-revision=3
+revision=4
 wrksrc="raven-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From eefc673e6f710ea4e19e568d2a01f20b447e38aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0959/1118] python3-readability-lxml: rebuild for Python 3.9

---
 srcpkgs/python3-readability-lxml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
index 00a446d3178..74241baaf67 100644
--- a/srcpkgs/python3-readability-lxml/template
+++ b/srcpkgs/python3-readability-lxml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-readability-lxml'
 pkgname=python3-readability-lxml
 version=0.8.1
-revision=2
+revision=3
 wrksrc="readability-lxml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a738beb85d99a50fac44e2e084928c8da66fa226 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0960/1118] python3-rebulk: rebuild for Python 3.9

---
 srcpkgs/python3-rebulk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-rebulk/template b/srcpkgs/python3-rebulk/template
index ce6b994a5b0..42118c4629a 100644
--- a/srcpkgs/python3-rebulk/template
+++ b/srcpkgs/python3-rebulk/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rebulk'
 pkgname=python3-rebulk
 version=2.0.1
-revision=2
+revision=3
 wrksrc="rebulk-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 10dd97a1478a5edd6f1d54478dbb8c680ccb7cac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0961/1118] python3-redis: rebuild for Python 3.9

---
 srcpkgs/python3-redis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index dea6175ef59..7c968b4a894 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-redis'
 pkgname=python3-redis
 version=3.5.3
-revision=2
+revision=3
 wrksrc="redis-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 14255d929370960836130df3834087975e77f8ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0962/1118] python3-regex: rebuild for Python 3.9

---
 srcpkgs/python3-regex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 355563d6494..140d0b3451d 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
 version=2020.2.20
-revision=2
+revision=3
 wrksrc="regex-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"

From 796923a1c25b65c0fb9621fa52a4db308aae7208 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0963/1118] python3-rencode: rebuild for Python 3.9

---
 srcpkgs/python3-rencode/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
index ff74c99cdcf..0edbd561f0f 100644
--- a/srcpkgs/python3-rencode/template
+++ b/srcpkgs/python3-rencode/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rencode'
 pkgname=python3-rencode
 version=1.0.6
-revision=5
+revision=6
 wrksrc="rencode-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-wheel"

From d2fdc31b08e266898a91816e5e3fba310f0add77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:04 -0400
Subject: [PATCH 0964/1118] python3-requests-mock: rebuild for Python 3.9

---
 srcpkgs/python3-requests-mock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-mock/template b/srcpkgs/python3-requests-mock/template
index 6a6ab2d81eb..49a817329e5 100644
--- a/srcpkgs/python3-requests-mock/template
+++ b/srcpkgs/python3-requests-mock/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-mock'
 pkgname=python3-requests-mock
 version=1.5.2
-revision=4
+revision=5
 wrksrc="requests-mock-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pbr"

From 889d776eda86e96cea7a3f3360d154025aa251bc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:05 -0400
Subject: [PATCH 0965/1118] python3-requests-oauthlib: rebuild for Python 3.9

---
 srcpkgs/python3-requests-oauthlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-oauthlib/template b/srcpkgs/python3-requests-oauthlib/template
index adc67716088..0cc1644a53c 100644
--- a/srcpkgs/python3-requests-oauthlib/template
+++ b/srcpkgs/python3-requests-oauthlib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-oauthlib'
 pkgname=python3-requests-oauthlib
 version=1.3.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d094be599be9b0f5fd1e3cfe612feee6dadab9a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:05 -0400
Subject: [PATCH 0966/1118] python3-requests-toolbelt: rebuild for Python 3.9

---
 srcpkgs/python3-requests-toolbelt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-requests-toolbelt/template b/srcpkgs/python3-requests-toolbelt/template
index 67a88dd3e24..436cb5e6997 100644
--- a/srcpkgs/python3-requests-toolbelt/template
+++ b/srcpkgs/python3-requests-toolbelt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-requests-toolbelt'
 pkgname=python3-requests-toolbelt
 version=0.9.1
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2cdf8bdd2f64d72633f1613664a93ad288dcd505 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:05 -0400
Subject: [PATCH 0967/1118] python3-ripe-atlas-cousteau: rebuild for Python 3.9

---
 srcpkgs/python3-ripe-atlas-cousteau/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ripe-atlas-cousteau/template b/srcpkgs/python3-ripe-atlas-cousteau/template
index 3ab160999d2..1e4422abef1 100644
--- a/srcpkgs/python3-ripe-atlas-cousteau/template
+++ b/srcpkgs/python3-ripe-atlas-cousteau/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ripe-atlas-cousteau'
 pkgname=python3-ripe-atlas-cousteau
 version=1.4.2
-revision=3
+revision=4
 wrksrc="ripe-atlas-cousteau-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0066411426e34b300217c77268ccac1a69b77b88 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:05 -0400
Subject: [PATCH 0968/1118] python3-ripe-atlas-sagan: rebuild for Python 3.9

---
 srcpkgs/python3-ripe-atlas-sagan/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ripe-atlas-sagan/template b/srcpkgs/python3-ripe-atlas-sagan/template
index 014d076cb7b..b7b42ae5f49 100644
--- a/srcpkgs/python3-ripe-atlas-sagan/template
+++ b/srcpkgs/python3-ripe-atlas-sagan/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ripe-atlas-sagan'
 pkgname=python3-ripe-atlas-sagan
 version=1.3.0
-revision=3
+revision=4
 wrksrc="ripe.atlas.sagan-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6c610da23e46bec3771b4ca57acf4ec2d42bb315 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:05 -0400
Subject: [PATCH 0969/1118] python3-rsa: rebuild for Python 3.9

---
 srcpkgs/python3-rsa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-rsa/template b/srcpkgs/python3-rsa/template
index 44fa53803a5..a4c915dc72b 100644
--- a/srcpkgs/python3-rsa/template
+++ b/srcpkgs/python3-rsa/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rsa'
 pkgname=python3-rsa
 version=4.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 662d2d6162231caa993ef5d704f07c4fe0d564c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:05 -0400
Subject: [PATCH 0970/1118] python3-rsistent: rebuild for Python 3.9

---
 srcpkgs/python3-rsistent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-rsistent/template b/srcpkgs/python3-rsistent/template
index dda2ec89e03..05a8ef1fe38 100644
--- a/srcpkgs/python3-rsistent/template
+++ b/srcpkgs/python3-rsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rsistent'
 pkgname=python3-rsistent
 version=0.15.7
-revision=1
+revision=2
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7f8cb2b0de28fc1322cd4f4970cbed9a24dcc994 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:05 -0400
Subject: [PATCH 0971/1118] python3-ruamel.yaml: rebuild for Python 3.9

---
 srcpkgs/python3-ruamel.yaml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ruamel.yaml/template b/srcpkgs/python3-ruamel.yaml/template
index 38e0b07abad..1efff06c001 100644
--- a/srcpkgs/python3-ruamel.yaml/template
+++ b/srcpkgs/python3-ruamel.yaml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ruamel.yaml'
 pkgname=python3-ruamel.yaml
 version=0.16.12
-revision=1
+revision=2
 wrksrc="ruamel.yaml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c3d7125cee33724345d68f3be1aa3b38acda2c95 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0972/1118] python3-ruamel.yaml.clib: rebuild for Python 3.9

---
 srcpkgs/python3-ruamel.yaml.clib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ruamel.yaml.clib/template b/srcpkgs/python3-ruamel.yaml.clib/template
index 211c7209ecd..6f930984eed 100644
--- a/srcpkgs/python3-ruamel.yaml.clib/template
+++ b/srcpkgs/python3-ruamel.yaml.clib/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ruamel.yaml.clib'
 pkgname=python3-ruamel.yaml.clib
 version=0.2.2
-revision=1
+revision=2
 wrksrc="ruamel.yaml.clib-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 4e211c8fc7c3bb133b7fd90842e39908ed075ffe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0973/1118] python3-s3transfer: rebuild for Python 3.9

---
 srcpkgs/python3-s3transfer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-s3transfer/template b/srcpkgs/python3-s3transfer/template
index 9357f623a99..559d3f508ef 100644
--- a/srcpkgs/python3-s3transfer/template
+++ b/srcpkgs/python3-s3transfer/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-s3transfer'
 pkgname=python3-s3transfer
 version=0.3.3
-revision=2
+revision=3
 wrksrc="s3transfer-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2ee445b5542b2e24a6c70013023644ae92fd13e7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0974/1118] python3-sabyenc3: rebuild for Python 3.9

---
 srcpkgs/python3-sabyenc3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sabyenc3/template b/srcpkgs/python3-sabyenc3/template
index 7df3ac9bdb0..5583ba6f20b 100644
--- a/srcpkgs/python3-sabyenc3/template
+++ b/srcpkgs/python3-sabyenc3/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sabyenc3'
 pkgname=python3-sabyenc3
 version=4.0.2
-revision=1
+revision=2
 wrksrc=sabyenc3-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From f0f03d1ab41e610d9b9978f793743ed9542635f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0975/1118] python3-scikit-image: rebuild for Python 3.9

---
 srcpkgs/python3-scikit-image/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index ded5914a67f..0f89f0ff82f 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scikit-image'
 pkgname=python3-scikit-image
 version=0.17.2
-revision=1
+revision=2
 _pkgname="${pkgname#python3-}"
 wrksrc="${_pkgname}-${version}"
 build_style=python3-module

From 5212e1ff62dac48402a1b10e9f1330c563ea201a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0976/1118] python3-scikit-learn: rebuild for Python 3.9

---
 srcpkgs/python3-scikit-learn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template
index e923339d1fd..59d88e5d8ab 100644
--- a/srcpkgs/python3-scikit-learn/template
+++ b/srcpkgs/python3-scikit-learn/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scikit-learn'
 pkgname=python3-scikit-learn
 version=0.23.1
-revision=1
+revision=2
 wrksrc="scikit-learn-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-scipy python3-joblib"

From bf071d1a550497d73a9136391c457476e3695571 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0977/1118] python3-scikit-video: rebuild for Python 3.9

---
 srcpkgs/python3-scikit-video/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scikit-video/template b/srcpkgs/python3-scikit-video/template
index 12e32a4f116..84af20de4fe 100644
--- a/srcpkgs/python3-scikit-video/template
+++ b/srcpkgs/python3-scikit-video/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scikit-video'
 pkgname=python3-scikit-video
 version=1.1.11
-revision=2
+revision=3
 wrksrc="scikit-video-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-scipy python3-Pillow"

From c8039c8fa98321fd176f267dbf29bb73a1e5c642 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0978/1118] python3-scipy: rebuild for Python 3.9

---
 srcpkgs/python3-scipy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template
index 1bf7c72217b..7e18ac2cde7 100644
--- a/srcpkgs/python3-scipy/template
+++ b/srcpkgs/python3-scipy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scipy'
 pkgname=python3-scipy
 version=1.5.2
-revision=1
+revision=2
 wrksrc="scipy-${version}"
 build_style=python3-module
 build_helper="numpy"

From 4dea759c9105fa682c2d7fe3275b087918c91d2b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:06 -0400
Subject: [PATCH 0979/1118] python3-scour: rebuild for Python 3.9

---
 srcpkgs/python3-scour/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scour/template b/srcpkgs/python3-scour/template
index 2f83104de7d..193b2c601ea 100644
--- a/srcpkgs/python3-scour/template
+++ b/srcpkgs/python3-scour/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scour'
 pkgname=python3-scour
 version=0.37
-revision=3
+revision=4
 wrksrc="scour-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d926dd321d713c953139c6004b4615f919e21f68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:07 -0400
Subject: [PATCH 0980/1118] python3-scrypt: rebuild for Python 3.9

---
 srcpkgs/python3-scrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index f1fb92366c0..5008c8dfbb8 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-scrypt'
 pkgname=python3-scrypt
 version=0.8.17
-revision=1
+revision=2
 wrksrc="scrypt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 64e9e96c4e551fd1c1093bf42876a4913b54cc57 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:07 -0400
Subject: [PATCH 0981/1118] python3-send2trash: rebuild for Python 3.9

---
 srcpkgs/python3-send2trash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-send2trash/template b/srcpkgs/python3-send2trash/template
index 88aacc6e744..8ef320362a7 100644
--- a/srcpkgs/python3-send2trash/template
+++ b/srcpkgs/python3-send2trash/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-send2trash'
 pkgname=python3-send2trash
 version=1.5.0
-revision=3
+revision=4
 wrksrc="send2trash-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a92208e65a651920038bea6b6fa59ab1a9f11537 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:07 -0400
Subject: [PATCH 0982/1118] python3-setproctitle: rebuild for Python 3.9

---
 srcpkgs/python3-setproctitle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
index 6b6f93931af..c23c4f3926b 100644
--- a/srcpkgs/python3-setproctitle/template
+++ b/srcpkgs/python3-setproctitle/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-setproctitle'
 pkgname=python3-setproctitle
 version=1.1.10
-revision=7
+revision=8
 wrksrc="setproctitle-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a10c103d4055a99155e0b0202c47d5fb3c4aa6f2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:07 -0400
Subject: [PATCH 0983/1118] python3-setuptools: rebuild for Python 3.9

---
 srcpkgs/python3-setuptools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index b741001be6b..6e7326f93e9 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
 version=50.3.0
-revision=1
+revision=2
 wrksrc="setuptools-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 5dc376d6cc54f2460d204e82b74de24905e628c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:07 -0400
Subject: [PATCH 0984/1118] python3-sh: rebuild for Python 3.9

---
 srcpkgs/python3-sh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sh/template b/srcpkgs/python3-sh/template
index ea02da1a46d..cbcf64ac1ef 100644
--- a/srcpkgs/python3-sh/template
+++ b/srcpkgs/python3-sh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sh'
 pkgname=python3-sh
 version=1.14.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e7e3ad2bbc9a96ab2a2234e15f97bd07c68b595d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:07 -0400
Subject: [PATCH 0985/1118] python3-shapely: rebuild for Python 3.9

---
 srcpkgs/python3-shapely/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 2f6e3d9ebf8..6e808c29264 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -2,7 +2,7 @@
 pkgname=python3-shapely
 reverts="1.7a1_1 1.7a1_2 1.7a1_3"
 version=1.7.1
-revision=1
+revision=2
 wrksrc="Shapely-${version}"
 build_style=python3-module
 build_helper=numpy

From 3c07a16b322214a7bb164bbcc6230f52744a5b2a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:07 -0400
Subject: [PATCH 0986/1118] python3-simplebayes: rebuild for Python 3.9

---
 srcpkgs/python3-simplebayes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-simplebayes/template b/srcpkgs/python3-simplebayes/template
index b87732b1e45..4a97e0af35c 100644
--- a/srcpkgs/python3-simplebayes/template
+++ b/srcpkgs/python3-simplebayes/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simplebayes'
 pkgname=python3-simplebayes
 version=1.5.8
-revision=3
+revision=4
 wrksrc="simplebayes-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 70d0edf24abf6082b18bbbca77877df82da12467 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0987/1118] python3-simplegeneric: rebuild for Python 3.9

---
 srcpkgs/python3-simplegeneric/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-simplegeneric/template b/srcpkgs/python3-simplegeneric/template
index e662c0f8afd..1d52210254c 100644
--- a/srcpkgs/python3-simplegeneric/template
+++ b/srcpkgs/python3-simplegeneric/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simplegeneric'
 pkgname=python3-simplegeneric
 version=0.8.1
-revision=5
+revision=6
 wrksrc="simplegeneric-${version}"
 build_style=python3-module
 hostmakedepends="unzip python3-setuptools"

From 75739a305d881bc163923f6c441ad71f8d7c6a9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0988/1118] python3-simplejson: rebuild for Python 3.9

---
 srcpkgs/python3-simplejson/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-simplejson/template b/srcpkgs/python3-simplejson/template
index 93ebf93980f..64e088e7c60 100644
--- a/srcpkgs/python3-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simplejson'
 pkgname=python3-simplejson
 version=3.17.0
-revision=3
+revision=4
 wrksrc="simplejson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c94a6201f76fed392a7ab447dffb62863bf44a7d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0989/1118] python3-sip-PyQt5: rebuild for Python 3.9

---
 srcpkgs/python3-sip-PyQt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template
index 8d89681539a..9e6e7d7ad0b 100644
--- a/srcpkgs/python3-sip-PyQt5/template
+++ b/srcpkgs/python3-sip-PyQt5/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sip-PyQt5'
 pkgname=python3-sip-PyQt5
 version=12.8.0
-revision=1
+revision=2
 wrksrc="PyQt5_sip-$version"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools sip5"

From 9b99e209d7a7bd3c5b7b39d5090929241705e4bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0990/1118] python3-slixmpp: rebuild for Python 3.9

---
 srcpkgs/python3-slixmpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-slixmpp/template b/srcpkgs/python3-slixmpp/template
index 13ecd253592..1426cb9703a 100644
--- a/srcpkgs/python3-slixmpp/template
+++ b/srcpkgs/python3-slixmpp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-slixmpp'
 pkgname=python3-slixmpp
 version=1.5.2
-revision=1
+revision=2
 wrksrc="slixmpp-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools python3-Cython"

From c07ff57075ba6fa0654ee8503b00d3de4220a447 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0991/1118] python3-smbc: rebuild for Python 3.9

---
 srcpkgs/python3-smbc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-smbc/template b/srcpkgs/python3-smbc/template
index b44e29ae84d..1b03cff313f 100644
--- a/srcpkgs/python3-smbc/template
+++ b/srcpkgs/python3-smbc/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-smbc'
 pkgname=python3-smbc
 version=1.0.18
-revision=1
+revision=2
 wrksrc="pysmbc-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3-devel python3-setuptools"

From 0cf81a420b63f5e5098f1b8a729d9e54c5eed1d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0992/1118] python3-smmap: rebuild for Python 3.9

---
 srcpkgs/python3-smmap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-smmap/template b/srcpkgs/python3-smmap/template
index 6df75e54c4c..3fff30973c1 100644
--- a/srcpkgs/python3-smmap/template
+++ b/srcpkgs/python3-smmap/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-smmap'
 pkgname=python3-smmap
 version=2.0.5
-revision=3
+revision=4
 wrksrc="smmap-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a10eeb706221aefbf5f50afa3dc4fcb0471b62b1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0993/1118] python3-snakeoil: update to 0.8.8

---
 srcpkgs/python3-snakeoil/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
index 713eb7aae81..7b3aa1420bb 100644
--- a/srcpkgs/python3-snakeoil/template
+++ b/srcpkgs/python3-snakeoil/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-snakeoil'
 pkgname=python3-snakeoil
-version=0.7.5
-revision=4
+version=0.8.8
+revision=1
 wrksrc="snakeoil-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,14 +12,14 @@ license="BSD-3-Clause, GPL-2.0-only"
 homepage="https://github.com/pkgcore/snakeoil"
 # changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
 distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
-checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
+checksum=8381ed730cb4c127c2cb5f99ed8a148d3f2bc492de21f035aae8913f7a106d63
 
 pre_check() {
 	export PYTHONPATH=$(cd build/lib* && pwd)
 }
 
 post_install() {
-	vlicense BSD
+	vlicense LICENSE
 }
 
 python3-snakeoil-devel_package() {

From 05a4f13297b5ffb8595478a6c0b531fe3c8653e0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:08 -0400
Subject: [PATCH 0994/1118] python3-snappy: rebuild for Python 3.9

---
 srcpkgs/python3-snappy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
index a23d3d6e401..39803e64e47 100644
--- a/srcpkgs/python3-snappy/template
+++ b/srcpkgs/python3-snappy/template
@@ -2,7 +2,7 @@
 pkgname=python3-snappy
 _pkgname=python-snappy
 version=0.5.4
-revision=3
+revision=4
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5e2f27b9a59982094eba79ffbfc3d60733db9f42 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:09 -0400
Subject: [PATCH 0995/1118] python3-snowballstemmer: rebuild for Python 3.9

---
 srcpkgs/python3-snowballstemmer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-snowballstemmer/template b/srcpkgs/python3-snowballstemmer/template
index 3dd5837d0d9..37733fa3660 100644
--- a/srcpkgs/python3-snowballstemmer/template
+++ b/srcpkgs/python3-snowballstemmer/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-snowballstemmer'
 pkgname=python3-snowballstemmer
 version=1.2.1
-revision=5
+revision=6
 wrksrc="snowballstemmer-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From c928b79fe136abd0a776819f4519d486acb694f5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:09 -0400
Subject: [PATCH 0996/1118] python3-socketIO-client: rebuild for Python 3.9

---
 srcpkgs/python3-socketIO-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-socketIO-client/template b/srcpkgs/python3-socketIO-client/template
index fa366a126e4..1bc4d41c4d8 100644
--- a/srcpkgs/python3-socketIO-client/template
+++ b/srcpkgs/python3-socketIO-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-socketIO-client'
 pkgname=python3-socketIO-client
 version=0.7.2
-revision=4
+revision=5
 wrksrc="socketIO-client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 89bac9a62c42149468cbd53bc19570a8d78efa97 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:09 -0400
Subject: [PATCH 0997/1118] python3-soupsieve: rebuild for Python 3.9

---
 srcpkgs/python3-soupsieve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 568fe455668..b74064c5312 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=3
+revision=4
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ee2d3608892468e331eeccea5054a0ce332fbab8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:09 -0400
Subject: [PATCH 0998/1118] python3-stem: rebuild for Python 3.9

---
 srcpkgs/python3-stem/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-stem/template b/srcpkgs/python3-stem/template
index 886a556ef94..b8778508bf6 100644
--- a/srcpkgs/python3-stem/template
+++ b/srcpkgs/python3-stem/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-stem'
 pkgname=python3-stem
 version=1.8.0
-revision=2
+revision=3
 wrksrc="stem-${version/b/}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 2e4de744908fb7911540baf8354a42cf37c51644 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:09 -0400
Subject: [PATCH 0999/1118] python3-stormssh: rebuild for Python 3.9

---
 srcpkgs/python3-stormssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-stormssh/template b/srcpkgs/python3-stormssh/template
index 840c0f687b5..d3986e9290d 100644
--- a/srcpkgs/python3-stormssh/template
+++ b/srcpkgs/python3-stormssh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-stormssh'
 pkgname=python3-stormssh
 version=0.7.0
-revision=3
+revision=4
 wrksrc=storm-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 439a341bf79941f3fd29ec5dc4be311f2df8db99 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:09 -0400
Subject: [PATCH 1000/1118] python3-tables: rebuild for Python 3.9

---
 srcpkgs/python3-tables/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tables/template b/srcpkgs/python3-tables/template
index 4d19273d063..37ab6df363a 100644
--- a/srcpkgs/python3-tables/template
+++ b/srcpkgs/python3-tables/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tables'
 pkgname=python3-tables
 version=3.6.1
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 pycompile_module="tables"

From ab9e2eba5cdb1b609e0065bf1d2f18a159683d02 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:09 -0400
Subject: [PATCH 1001/1118] python3-tempora: rebuild for Python 3.9

---
 srcpkgs/python3-tempora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tempora/template b/srcpkgs/python3-tempora/template
index 8a54b3f3c85..c4dbebd31b3 100644
--- a/srcpkgs/python3-tempora/template
+++ b/srcpkgs/python3-tempora/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tempora'
 pkgname=python3-tempora
 version=2.0.0
-revision=2
+revision=3
 wrksrc="tempora-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 0e9d713a977203699f55a78d61e1713842750786 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:10 -0400
Subject: [PATCH 1002/1118] python3-termcolor: rebuild for Python 3.9

---
 srcpkgs/python3-termcolor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-termcolor/template b/srcpkgs/python3-termcolor/template
index c3e4ac4068e..890e115ac65 100644
--- a/srcpkgs/python3-termcolor/template
+++ b/srcpkgs/python3-termcolor/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-termcolor'
 pkgname=python3-termcolor
 version=1.1.0
-revision=7
+revision=8
 wrksrc="termcolor-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel"

From 6d648545897e55d48ddd39b6e8e3931890801b5b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:10 -0400
Subject: [PATCH 1003/1118] python3-terminado: rebuild for Python 3.9

---
 srcpkgs/python3-terminado/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-terminado/template b/srcpkgs/python3-terminado/template
index 0257221f108..f7e32aebd35 100644
--- a/srcpkgs/python3-terminado/template
+++ b/srcpkgs/python3-terminado/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-terminado'
 pkgname=python3-terminado
 version=0.8.2
-revision=3
+revision=4
 wrksrc="terminado-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2a8456caa5aa2a838c6eda67b0e17402cea63087 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:10 -0400
Subject: [PATCH 1004/1118] python3-testpath: rebuild for Python 3.9

---
 srcpkgs/python3-testpath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-testpath/template b/srcpkgs/python3-testpath/template
index 26499eefae9..49413b26736 100644
--- a/srcpkgs/python3-testpath/template
+++ b/srcpkgs/python3-testpath/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-testpath'
 pkgname=python3-testpath
 version=0.4.2
-revision=3
+revision=4
 wrksrc="testpath-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b2300dd6ab7f9c35523f22c450211bca964ef3a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:10 -0400
Subject: [PATCH 1005/1118] python3-testtools: rebuild for Python 3.9

---
 srcpkgs/python3-testtools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-testtools/template b/srcpkgs/python3-testtools/template
index 82a29861061..43500391a4f 100644
--- a/srcpkgs/python3-testtools/template
+++ b/srcpkgs/python3-testtools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-testtools'
 pkgname=python3-testtools
 version=2.4.0
-revision=1
+revision=2
 wrksrc="testtools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From be4825b8a521544e04200a76b484615d7bf3212c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:10 -0400
Subject: [PATCH 1006/1118] python3-texttable: rebuild for Python 3.9

---
 srcpkgs/python3-texttable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-texttable/template b/srcpkgs/python3-texttable/template
index 6c52d76cba8..108a1883fbe 100644
--- a/srcpkgs/python3-texttable/template
+++ b/srcpkgs/python3-texttable/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-texttable'
 pkgname=python3-texttable
 version=1.6.1
-revision=3
+revision=4
 wrksrc="texttable-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 483f80e6c53761fccb682672e6c59b12fe6ed3f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:10 -0400
Subject: [PATCH 1007/1118] python3-tifffile: rebuild for Python 3.9

---
 srcpkgs/python3-tifffile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index b46febfd926..dbf2450c13a 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
 version=2020.10.1
-revision=1
+revision=2
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 92d9f8b0935e74b77f81df88dd305de412ea5d1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1008/1118] python3-tmuxp: rebuild for Python 3.9

---
 srcpkgs/python3-tmuxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tmuxp/template b/srcpkgs/python3-tmuxp/template
index 907b3744e49..825903b8ca7 100644
--- a/srcpkgs/python3-tmuxp/template
+++ b/srcpkgs/python3-tmuxp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tmuxp'
 pkgname=python3-tmuxp
 version=1.5.4
-revision=2
+revision=3
 wrksrc="tmuxp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 51dbd2162dec0dc833f456acc5343403295949e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1009/1118] python3-toml: rebuild for Python 3.9

---
 srcpkgs/python3-toml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-toml/template b/srcpkgs/python3-toml/template
index da4f7137f8f..c0f75c89335 100644
--- a/srcpkgs/python3-toml/template
+++ b/srcpkgs/python3-toml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-toml'
 pkgname=python3-toml
 version=0.10.0
-revision=3
+revision=4
 wrksrc="toml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 40fec247408bddcb48257d5019051de7a68daa04 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1010/1118] python3-tornado: rebuild for Python 3.9

---
 srcpkgs/python3-tornado/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index a333121713e..95296e8ddcf 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tornado'
 pkgname=python3-tornado
 version=5.1.1
-revision=2
+revision=3
 wrksrc="tornado-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d89dce0343afd8a40de6be1a3dc666fa39e6d54c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1011/1118] python3-tqdm: rebuild for Python 3.9

---
 srcpkgs/python3-tqdm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tqdm/template b/srcpkgs/python3-tqdm/template
index 2b686aa510b..96c8d07f049 100644
--- a/srcpkgs/python3-tqdm/template
+++ b/srcpkgs/python3-tqdm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tqdm'
 pkgname=python3-tqdm
 version=4.48.2
-revision=2
+revision=3
 wrksrc="tqdm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8d4870cc45537cb6c9afd1fb51691a8874d604b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1012/1118] python3-traitlets: rebuild for Python 3.9

---
 srcpkgs/python3-traitlets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 83c9c90dadd..72b7d9208be 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-traitlets'
 pkgname=python3-traitlets
 version=5.0.4
-revision=1
+revision=2
 wrksrc="traitlets-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From ea1b63cc7583eb0c72c02ebee891d76f7ae4bede Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1013/1118] python3-trimesh: rebuild for Python 3.9

---
 srcpkgs/python3-trimesh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index 29780c457f4..34db0a71acc 100644
--- a/srcpkgs/python3-trimesh/template
+++ b/srcpkgs/python3-trimesh/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-trimesh'
 pkgname=python3-trimesh
 version=3.8.8
-revision=1
+revision=2
 wrksrc="trimesh-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5143df1a21bcf1e230823e63848c0f538f12446f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1014/1118] python3-ttystatus: rebuild for Python 3.9

---
 srcpkgs/python3-ttystatus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-ttystatus/template b/srcpkgs/python3-ttystatus/template
index dec36bfc349..f3408d4f718 100644
--- a/srcpkgs/python3-ttystatus/template
+++ b/srcpkgs/python3-ttystatus/template
@@ -2,7 +2,7 @@
 pkgname=python3-ttystatus
 _pkgname=${pkgname/3/}
 version=0.38
-revision=3
+revision=4
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1becead594a6a176cf71854a9deb866676b7bec4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:11 -0400
Subject: [PATCH 1015/1118] python3-tweepy: rebuild for Python 3.9

---
 srcpkgs/python3-tweepy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-tweepy/template b/srcpkgs/python3-tweepy/template
index ea64b1a2609..0acc2549ea0 100644
--- a/srcpkgs/python3-tweepy/template
+++ b/srcpkgs/python3-tweepy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-tweepy'
 pkgname=python3-tweepy
 version=3.8.0
-revision=3
+revision=4
 wrksrc="tweepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 633b1f8d8ed43cd634cda676f458d49baff2a660 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1016/1118] python3-twitter: rebuild for Python 3.9

---
 srcpkgs/python3-twitter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-twitter/template b/srcpkgs/python3-twitter/template
index 66f386df72c..386917ff15c 100644
--- a/srcpkgs/python3-twitter/template
+++ b/srcpkgs/python3-twitter/template
@@ -2,7 +2,7 @@
 pkgname=python3-twitter
 _pkgname=${pkgname/3/}
 version=3.5
-revision=3
+revision=4
 wrksrc=$_pkgname-$version
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d1808f5ec91f2d5f381600ff05e64d53cc760fb1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1017/1118] python3-typed-ast: rebuild for Python 3.9

---
 srcpkgs/python3-typed-ast/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-typed-ast/template b/srcpkgs/python3-typed-ast/template
index e5fe6e9afdf..7c176c7c315 100644
--- a/srcpkgs/python3-typed-ast/template
+++ b/srcpkgs/python3-typed-ast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-typed-ast'
 pkgname=python3-typed-ast
 version=1.4.1
-revision=1
+revision=2
 wrksrc="typed_ast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 75a913405552b29e72dc7aecb7990b40eb8db80f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1018/1118] python3-ultrajson: update to 4.0.0

---
 srcpkgs/python3-ultrajson/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 1784be3596a..faf1e2e7628 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=3.2.0
+version=4.0.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -11,7 +11,11 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=abb1996ba1c1d2faf5b1e38efa97da7f64e5373a31f705b96fe0587f5f778db4
+checksum=dba37ad41906d7f9ff52deeb729b9add7e305b94673b41979e9a6c5914083aa8
+
+post_patch() {
+	vsed -i setup.py -e 's/"setuptools_scm"//g'
+}
 
 post_install() {
 	vlicense LICENSE.txt

From 6e541e0a65f922084dcbf27220bfaeae557b8b7f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1019/1118] python3-unittest-mixins: rebuild for Python 3.9

---
 srcpkgs/python3-unittest-mixins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-unittest-mixins/template b/srcpkgs/python3-unittest-mixins/template
index 32e19425ccf..f597b3bd776 100644
--- a/srcpkgs/python3-unittest-mixins/template
+++ b/srcpkgs/python3-unittest-mixins/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-unittest-mixins'
 pkgname=python3-unittest-mixins
 version=1.6
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From df5a97f7ecc36e82833ffad65a595e7dde9089de Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1020/1118] python3-urbandict: rebuild for Python 3.9

---
 srcpkgs/python3-urbandict/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-urbandict/template b/srcpkgs/python3-urbandict/template
index c059d78dd0e..430acb937dc 100644
--- a/srcpkgs/python3-urbandict/template
+++ b/srcpkgs/python3-urbandict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-urbandict'
 pkgname=python3-urbandict
 version=0.6.1
-revision=2
+revision=3
 wrksrc="urbandict-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9c50ff58bb06a8cb2c68ba252d2681ba3d5da646 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1021/1118] python3-uritemplate: rebuild for Python 3.9

---
 srcpkgs/python3-uritemplate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
index 9e4053f31ce..774b51825e1 100644
--- a/srcpkgs/python3-uritemplate/template
+++ b/srcpkgs/python3-uritemplate/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-uritemplate'
 pkgname=python3-uritemplate
 version=3.0.1
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 51799f9a6a4b916879ab14901d58c9403a55343c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1022/1118] python3-uritools: rebuild for Python 3.9

---
 srcpkgs/python3-uritools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-uritools/template b/srcpkgs/python3-uritools/template
index 5b02548be87..761a8f4a179 100644
--- a/srcpkgs/python3-uritools/template
+++ b/srcpkgs/python3-uritools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-uritools'
 pkgname=python3-uritools
 version=3.0.0
-revision=1
+revision=2
 wrksrc="uritools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 3a38f9b04be812b703228053404fba053080abb7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:12 -0400
Subject: [PATCH 1023/1118] python3-urwidtrees: rebuild for Python 3.9

---
 srcpkgs/python3-urwidtrees/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template
index a3cff8b18fc..a87210ebe16 100644
--- a/srcpkgs/python3-urwidtrees/template
+++ b/srcpkgs/python3-urwidtrees/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-urwidtrees'
 pkgname=python3-urwidtrees
 version=1.0.2
-revision=4
+revision=5
 wrksrc="urwidtrees-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-urwid"

From bf4416e769dd76084c7cfe5e0240ac2c66906250 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:13 -0400
Subject: [PATCH 1024/1118] python3-usb: rebuild for Python 3.9

---
 srcpkgs/python3-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template
index 2bb50d6d67c..b86f203fcd7 100644
--- a/srcpkgs/python3-usb/template
+++ b/srcpkgs/python3-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-usb'
 pkgname=python3-usb
 version=1.1.0
-revision=3
+revision=4
 wrksrc="pyusb-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a39c56b82bb8268889704fb249f6ff36f8618a33 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:13 -0400
Subject: [PATCH 1025/1118] python3-utils: rebuild for Python 3.9

---
 srcpkgs/python3-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template
index 00135c5218e..b9678c4e43d 100644
--- a/srcpkgs/python3-utils/template
+++ b/srcpkgs/python3-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-utils'
 pkgname=python3-utils
 version=2.4.0
-revision=2
+revision=3
 wrksrc="python-utils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From cf5676077f363c88beb87fce4876b0639ffcee19 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:13 -0400
Subject: [PATCH 1026/1118] python3-uvloop: rebuild for Python 3.9

---
 srcpkgs/python3-uvloop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 124f2775cf6..9bb256f5729 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-uvloop'
 pkgname=python3-uvloop
 version=0.14.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-Cython"

From e5939b55c287fda0d78928c4ecc78196d9b1e70a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:13 -0400
Subject: [PATCH 1027/1118] python3-vdf: rebuild for Python 3.9

---
 srcpkgs/python3-vdf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-vdf/template b/srcpkgs/python3-vdf/template
index 2a2819a6d6b..0389375421f 100644
--- a/srcpkgs/python3-vdf/template
+++ b/srcpkgs/python3-vdf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vdf'
 pkgname=python3-vdf
 version=3.2
-revision=2
+revision=3
 wrksrc=vdf-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1f9afe090ec0d0f6a7afe649bf21f405d3a12e4c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:13 -0400
Subject: [PATCH 1028/1118] python3-vint: rebuild for Python 3.9

---
 srcpkgs/python3-vint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-vint/template b/srcpkgs/python3-vint/template
index f696f11e8cd..3944d9b507e 100644
--- a/srcpkgs/python3-vint/template
+++ b/srcpkgs/python3-vint/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vint'
 pkgname=python3-vint
 version=0.3.19
-revision=4
+revision=5
 wrksrc="vim-vint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b10b725942f1171f4d5dc2b77d31d0a96520a2db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:13 -0400
Subject: [PATCH 1029/1118] python3-vispy: rebuild for Python 3.9

---
 srcpkgs/python3-vispy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-vispy/template b/srcpkgs/python3-vispy/template
index 9c2b61137a9..8d6b70aaef6 100644
--- a/srcpkgs/python3-vispy/template
+++ b/srcpkgs/python3-vispy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vispy'
 pkgname=python3-vispy
 version=0.6.1
-revision=3
+revision=4
 wrksrc="vispy-${version}"
 build_style=python3-module
 build_helper=numpy

From 29d3f515d848e728cf4635379f379f77ec858a0b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:13 -0400
Subject: [PATCH 1030/1118] python3-vobject: rebuild for Python 3.9

---
 srcpkgs/python3-vobject/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-vobject/template b/srcpkgs/python3-vobject/template
index 5b54005f35a..f727f5b1a35 100644
--- a/srcpkgs/python3-vobject/template
+++ b/srcpkgs/python3-vobject/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-vobject'
 pkgname=python3-vobject
 version=0.9.6.1
-revision=3
+revision=4
 wrksrc="vobject-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From d57be94bf52bb81cf4779d7cfb4f3f235cd90940 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1031/1118] python3-voluptuous: rebuild for Python 3.9

---
 srcpkgs/python3-voluptuous/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-voluptuous/template b/srcpkgs/python3-voluptuous/template
index 6dc746121dd..d8514443b4f 100644
--- a/srcpkgs/python3-voluptuous/template
+++ b/srcpkgs/python3-voluptuous/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-voluptuous'
 pkgname=python3-voluptuous
 version=0.11.5
-revision=4
+revision=5
 wrksrc="voluptuous-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 1df9b798e11121a6d0876c69e4620ddbfbaac7f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1032/1118] python3-watchdog: rebuild for Python 3.9

---
 srcpkgs/python3-watchdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-watchdog/template b/srcpkgs/python3-watchdog/template
index 455820fbebd..df369a2bce4 100644
--- a/srcpkgs/python3-watchdog/template
+++ b/srcpkgs/python3-watchdog/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-watchdog'
 pkgname=python3-watchdog
 version=0.9.0
-revision=3
+revision=4
 wrksrc="watchdog-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e7418fa1a690d6dfec8a7c05ac4c498cd69fcf5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1033/1118] python3-watchman: rebuild for Python 3.9

---
 srcpkgs/python3-watchman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
index 657e75d7a35..c06e798cd57 100644
--- a/srcpkgs/python3-watchman/template
+++ b/srcpkgs/python3-watchman/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-watchman'
 pkgname=python3-watchman
 version=1.4.1
-revision=5
+revision=6
 create_wrksrc=yes
 build_wrksrc="pywatchman-${version}"
 build_style=python3-module

From 6c4e57e6e2b7353a4f433d6231091b42de8c7449 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1034/1118] python3-webassets: rebuild for Python 3.9

---
 srcpkgs/python3-webassets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-webassets/template b/srcpkgs/python3-webassets/template
index 0abeecab8d8..45d1406ef52 100644
--- a/srcpkgs/python3-webassets/template
+++ b/srcpkgs/python3-webassets/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-webassets'
 pkgname=python3-webassets
 version=0.12.1
-revision=4
+revision=5
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9b66dfaa38b5d8cbbd5cf940fa26edf187a95a0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1035/1118] python3-webencodings: rebuild for Python 3.9

---
 srcpkgs/python3-webencodings/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
index 0c57a319520..fa4d415ac43 100644
--- a/srcpkgs/python3-webencodings/template
+++ b/srcpkgs/python3-webencodings/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-webencodings'
 pkgname=python3-webencodings
 version=0.5.1
-revision=5
+revision=6
 wrksrc="webencodings-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From dd998ecb2ad9f12f7065af9b49f6cc6b979aec77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1036/1118] python3-websocket-client: rebuild for Python 3.9

---
 srcpkgs/python3-websocket-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-websocket-client/template b/srcpkgs/python3-websocket-client/template
index feefd2fb518..82c02ff9f6e 100644
--- a/srcpkgs/python3-websocket-client/template
+++ b/srcpkgs/python3-websocket-client/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-websocket-client'
 pkgname=python3-websocket-client
 version=0.56.0
-revision=3
+revision=4
 wrksrc="websocket_client-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8cf54e0e83b73d345c2bc5388a0084e9fb73a8bb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1037/1118] python3-wheel: rebuild for Python 3.9

---
 srcpkgs/python3-wheel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-wheel/template b/srcpkgs/python3-wheel/template
index 5b5df9382dc..35388e37451 100644
--- a/srcpkgs/python3-wheel/template
+++ b/srcpkgs/python3-wheel/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wheel'
 pkgname=python3-wheel
 version=0.35.1
-revision=2
+revision=3
 wrksrc="wheel-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 01d86a6b626482cdb548967607b52a696808c97d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:14 -0400
Subject: [PATCH 1038/1118] python3-wikipedia: rebuild for Python 3.9

---
 srcpkgs/python3-wikipedia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-wikipedia/template b/srcpkgs/python3-wikipedia/template
index 53d09a7ef7f..e38ba579288 100644
--- a/srcpkgs/python3-wikipedia/template
+++ b/srcpkgs/python3-wikipedia/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wikipedia'
 pkgname=python3-wikipedia
 version=1.4.0
-revision=4
+revision=5
 wrksrc="wikipedia-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a9a25b27d1e35446ef58e7c7faf31e873895fb46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:15 -0400
Subject: [PATCH 1039/1118] python3-wrapt: rebuild for Python 3.9

---
 srcpkgs/python3-wrapt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
index b41968c4855..ccb7a685fcb 100644
--- a/srcpkgs/python3-wrapt/template
+++ b/srcpkgs/python3-wrapt/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wrapt'
 pkgname=python3-wrapt
 version=1.11.2
-revision=3
+revision=4
 wrksrc="wrapt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7074544f9c69e46254fc2790566e18caa404626b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:15 -0400
Subject: [PATCH 1040/1118] python3-wsproto: rebuild for Python 3.9

---
 srcpkgs/python3-wsproto/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-wsproto/template b/srcpkgs/python3-wsproto/template
index 4d1bacea900..6d2dab99f60 100644
--- a/srcpkgs/python3-wsproto/template
+++ b/srcpkgs/python3-wsproto/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-wsproto'
 pkgname=python3-wsproto
 version=0.15.0
-revision=3
+revision=4
 wrksrc="wsproto-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 01e60d100717841785f5ee022599556a3dc2c8ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:15 -0400
Subject: [PATCH 1041/1118] python3-xmlschema: rebuild for Python 3.9

---
 srcpkgs/python3-xmlschema/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-xmlschema/template b/srcpkgs/python3-xmlschema/template
index c73065c2222..88999be9e53 100644
--- a/srcpkgs/python3-xmlschema/template
+++ b/srcpkgs/python3-xmlschema/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xmlschema'
 pkgname=python3-xmlschema
 version=1.2.4
-revision=1
+revision=2
 wrksrc=xmlschema-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-elementpath"

From 64ebd94ba4c4241105e1bad468f467325d8eabbb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:15 -0400
Subject: [PATCH 1042/1118] python3-xmltodict: rebuild for Python 3.9

---
 srcpkgs/python3-xmltodict/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-xmltodict/template b/srcpkgs/python3-xmltodict/template
index 69e7f78c775..14243ddb006 100644
--- a/srcpkgs/python3-xmltodict/template
+++ b/srcpkgs/python3-xmltodict/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xmltodict'
 pkgname=python3-xmltodict
 version=0.12.0
-revision=3
+revision=4
 wrksrc="xmltodict-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 73272d5993fee751c85c236ac2f030d5dce97a06 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:15 -0400
Subject: [PATCH 1043/1118] python3-xxhash: rebuild for Python 3.9

---
 srcpkgs/python3-xxhash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-xxhash/template b/srcpkgs/python3-xxhash/template
index a0c102efaf5..2d1658271cf 100644
--- a/srcpkgs/python3-xxhash/template
+++ b/srcpkgs/python3-xxhash/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xxhash'
 pkgname=python3-xxhash
 version=2.0.0
-revision=1
+revision=2
 wrksrc="xxhash-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From e6b400d33ff996164cafe4bcf4f9a8d5e8d6d102 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:15 -0400
Subject: [PATCH 1044/1118] python3-yaml: rebuild for Python 3.9

---
 srcpkgs/python3-yaml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
index b2e961166a0..205db081261 100644
--- a/srcpkgs/python3-yaml/template
+++ b/srcpkgs/python3-yaml/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yaml'
 pkgname=python3-yaml
 version=5.3.1
-revision=2
+revision=3
 wrksrc="PyYAML-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b89db575551bdc3af8aab3f854ea47a8885e5d49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:15 -0400
Subject: [PATCH 1045/1118] python3-yamllint: rebuild for Python 3.9

---
 srcpkgs/python3-yamllint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template
index 02ed9302afa..6aeedcabe3f 100644
--- a/srcpkgs/python3-yamllint/template
+++ b/srcpkgs/python3-yamllint/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yamllint'
 pkgname=python3-yamllint
 version=1.15.0
-revision=3
+revision=4
 wrksrc="yamllint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9664c6b0a0572fb96c58f9c70927f93d47bb616e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1046/1118] python3-yara: rebuild for Python 3.9

---
 srcpkgs/python3-yara/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index 4441fa7a0c4..cb8c10b5759 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
 version=4.0.2
-revision=1
+revision=2
 wrksrc="yara-python-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 6e3fa364b259d1d1ba4b7ad8671d33e898004200 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1047/1118] python3-yarl: rebuild for Python 3.9

---
 srcpkgs/python3-yarl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template
index ecb79a3cc9c..06ebeacd71f 100644
--- a/srcpkgs/python3-yarl/template
+++ b/srcpkgs/python3-yarl/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-yarl'
 pkgname=python3-yarl
 version=1.3.0
-revision=3
+revision=4
 wrksrc="yarl-${version}"
 build_style=python3-module
 pycompile_module="yarl"

From eeb4075c3706b6a1b94bb480de7d0d957babb0be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1048/1118] python3-zc.lockfile: rebuild for Python 3.9

---
 srcpkgs/python3-zc.lockfile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zc.lockfile/template b/srcpkgs/python3-zc.lockfile/template
index f91f0df64d4..afac0c19e8b 100644
--- a/srcpkgs/python3-zc.lockfile/template
+++ b/srcpkgs/python3-zc.lockfile/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zc.lockfile'
 pkgname=python3-zc.lockfile
 version=2.0
-revision=3
+revision=4
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From a658a389cffa0739b0ce120d7b813b92104570f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1049/1118] python3-zeroconf: rebuild for Python 3.9

---
 srcpkgs/python3-zeroconf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index eefb11407e6..845e83651a4 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
 version=0.28.5
-revision=1
+revision=2
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 039d250899647d052ec5096b27bb416aa98ad6e1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1050/1118] python3-zipstream: rebuild for Python 3.9

---
 srcpkgs/python3-zipstream/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zipstream/template b/srcpkgs/python3-zipstream/template
index 2d57399b2ac..1430081027b 100644
--- a/srcpkgs/python3-zipstream/template
+++ b/srcpkgs/python3-zipstream/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zipstream'
 pkgname=python3-zipstream
 version=1.1.4
-revision=5
+revision=6
 wrksrc="python-zipstream-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 8568b1229aeb766b2e2de4e1ebe3846197e2c018 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1051/1118] python3-zope.component: rebuild for Python 3.9

---
 srcpkgs/python3-zope.component/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.component/template b/srcpkgs/python3-zope.component/template
index 954984473b4..aee1c9b51cc 100644
--- a/srcpkgs/python3-zope.component/template
+++ b/srcpkgs/python3-zope.component/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.component'
 pkgname=python3-zope.component
 version=4.6.2
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 9d02298b70720bb683d0afbb7bb1932e47aed802 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1052/1118] python3-zope.exceptions: rebuild for Python 3.9

---
 srcpkgs/python3-zope.exceptions/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.exceptions/template b/srcpkgs/python3-zope.exceptions/template
index 261a224bb09..8f06c14c375 100644
--- a/srcpkgs/python3-zope.exceptions/template
+++ b/srcpkgs/python3-zope.exceptions/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.exceptions'
 pkgname=python3-zope.exceptions
 version=4.4
-revision=1
+revision=2
 wrksrc="zope.exceptions-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-repoze.sphinx.autointerface

From 4af56e25b4f3034aac2078ac111d2ccaad7a69f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:16 -0400
Subject: [PATCH 1053/1118] python3-zope.i18nmessageid: rebuild for Python 3.9

---
 srcpkgs/python3-zope.i18nmessageid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.i18nmessageid/template b/srcpkgs/python3-zope.i18nmessageid/template
index 6b9e1a8db05..53e4600ded4 100644
--- a/srcpkgs/python3-zope.i18nmessageid/template
+++ b/srcpkgs/python3-zope.i18nmessageid/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.i18nmessageid'
 pkgname=python3-zope.i18nmessageid
 version=5.0.1
-revision=1
+revision=2
 wrksrc="zope.i18nmessageid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From 28fb5348046baf50ed26d97b8ab998964abb927c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1054/1118] python3-zope.proxy: rebuild for Python 3.9

---
 srcpkgs/python3-zope.proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.proxy/template b/srcpkgs/python3-zope.proxy/template
index 8d62e1873d7..6b36788d081 100644
--- a/srcpkgs/python3-zope.proxy/template
+++ b/srcpkgs/python3-zope.proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.proxy'
 pkgname=python3-zope.proxy
 version=4.3.5
-revision=1
+revision=2
 wrksrc="zope.proxy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Sphinx"

From f806f589cf5a784c8bc868464da2a18f6f16c477 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1055/1118] python3-zope.security: rebuild for Python 3.9

---
 srcpkgs/python3-zope.security/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-zope.security/template b/srcpkgs/python3-zope.security/template
index 682e1467cb1..5cc8e5c95dc 100644
--- a/srcpkgs/python3-zope.security/template
+++ b/srcpkgs/python3-zope.security/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-zope.security'
 pkgname=python3-zope.security
 version=5.1.1
-revision=1
+revision=2
 wrksrc="zope.security-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-distutils-extra"

From 1f63b7226ed42ac64f2576412f8d8fd8f8da4047 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1056/1118] qutebrowser: rebuild for Python 3.9

---
 srcpkgs/qutebrowser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index a9c989f3e39..ef7e343d368 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,7 +1,7 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
 version=1.13.1
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
 depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2

From a99a0b01dd6e51370bbbeef8cd06e22152fcb76f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1057/1118] r128gain: rebuild for Python 3.9

---
 srcpkgs/r128gain/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/r128gain/template b/srcpkgs/r128gain/template
index 32e8628b9d7..ea2cf9537dc 100644
--- a/srcpkgs/r128gain/template
+++ b/srcpkgs/r128gain/template
@@ -1,7 +1,7 @@
 # Template file for 'r128gain'
 pkgname=r128gain
 version=1.0.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-crcmod python3-ffmpeg-python python3-mutagen python3-tqdm"

From 4fdddbdda5137f1ce84cbaaaa03ce8282438a1b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1058/1118] radicale: rebuild for Python 3.9

---
 srcpkgs/radicale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 9c8f6a93978..0500a4b773d 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,7 +1,7 @@
 # Template file for 'radicale'
 pkgname=radicale
 version=3.0.6
-revision=1
+revision=2
 wrksrc="Radicale-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 7a80174e362cefaf3a8bf3e7cb80715c3ad353ef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1059/1118] rdiff-backup: rebuild for Python 3.9

---
 srcpkgs/rdiff-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template
index 2bb71780834..752c58e6cbc 100644
--- a/srcpkgs/rdiff-backup/template
+++ b/srcpkgs/rdiff-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'rdiff-backup'
 pkgname=rdiff-backup
 version=2.0.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 makedepends="python3-devel librsync-devel"

From ca6cbbba241caec3d5ef05eb0423afd84a3ccd1e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1060/1118] redshift: rebuild for Python 3.9

---
 srcpkgs/redshift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index c58b8daeb76..8db3878a502 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -1,7 +1,7 @@
 # Template file for 'redshift'
 pkgname=redshift
 version=1.12
-revision=2
+revision=3
 build_style=gnu-configure
 build_options="geoclue2"
 configure_args="--enable-gui --disable-geoclue $(vopt_enable geoclue2)"

From fb061fb6b7677522e3ee835802ad852748741148 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:17 -0400
Subject: [PATCH 1061/1118] renderdoc: rebuild for Python 3.9

---
 srcpkgs/renderdoc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 9921297e723..96594d02f22 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -1,7 +1,7 @@
 # Template file for 'renderdoc'
 pkgname=renderdoc
 version=1.4
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON
  -DENABLE_RENDERDOCCMD=ON -DENABLE_VULKAN=ON -DENABLE_XCB=ON -DENABLE_XLIB=ON

From 437c6d03b98c07b4f1ee8224abf96a3a166f5aed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:18 -0400
Subject: [PATCH 1062/1118] rmlint: rebuild for Python 3.9

---
 srcpkgs/rmlint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template
index 0c7afc954b3..b77f20b805a 100644
--- a/srcpkgs/rmlint/template
+++ b/srcpkgs/rmlint/template
@@ -1,7 +1,7 @@
 # Template file for 'rmlint'
 pkgname=rmlint
 version=2.10.1
-revision=1
+revision=2
 build_style=scons
 hostmakedepends="pkg-config python3-Sphinx glib-devel"
 makedepends="libblkid-devel elfutils-devel json-glib-devel"

From 36145ac527969be1babb162ea5396cc300c7fb7a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:18 -0400
Subject: [PATCH 1063/1118] rpm: rebuild for Python 3.9

---
 srcpkgs/rpm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 26d91814102..d39c3746781 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -1,7 +1,7 @@
 # Template file for 'rpm'
 pkgname=rpm
 version=4.15.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-lua --with-cap --with-acl --with-external-db
  --enable-python PYTHON=python3 --sharedstatedir=/var/lib"

From 1a746ef5568fb165361fe95586fd0f002dccf9f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:18 -0400
Subject: [PATCH 1064/1118] rrdtool: rebuild for Python 3.9

---
 srcpkgs/rrdtool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 6a5ff2676a3..6877929c8dc 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.7.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-perl --enable-perl-site-install
  --with-perl-options=INSTALLDIRS=vendor --enable-ruby

From ddb15001ab0f23a0e4ef37f7f7672a43d5b75b9d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:18 -0400
Subject: [PATCH 1065/1118] rtslib-fb: rebuild for Python 3.9

---
 srcpkgs/rtslib-fb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtslib-fb/template b/srcpkgs/rtslib-fb/template
index b1572850212..b9d6f67fa62 100644
--- a/srcpkgs/rtslib-fb/template
+++ b/srcpkgs/rtslib-fb/template
@@ -1,10 +1,10 @@
 # Template file for 'rtslib-fb'
 pkgname=rtslib-fb
 version=2.1.72
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-six python3-pyudev libudev"
+depends="python3-six python3-pyudev"
 checkdepends="$depends"
 short_desc="Python object API for managing the Linux LIO kernel target"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 024c4734795610239af8910dc714d9e0ad2dbb35 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:18 -0400
Subject: [PATCH 1066/1118] screenkey: rebuild for Python 3.9

---
 srcpkgs/screenkey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/screenkey/template b/srcpkgs/screenkey/template
index 4608f9c9f15..fa623d9396f 100644
--- a/srcpkgs/screenkey/template
+++ b/srcpkgs/screenkey/template
@@ -1,7 +1,7 @@
 # Template file for 'screenkey'
 pkgname=screenkey
 version=1.2
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="intltool python3-setuptools python3-distutils-extra"
 depends="gtk+3 libX11 python3-gobject"

From 70db9d3457bb468716fe9e32bafbe89bef16e8c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:18 -0400
Subject: [PATCH 1067/1118] setzer: rebuild for Python 3.9

---
 srcpkgs/setzer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index f7321d39dd7..cecfaeef56e 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,7 +1,7 @@
 # Template file for 'setzer'
 pkgname=setzer
 version=0.3.2
-revision=1
+revision=2
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"

From 786044aa966b33ed9d399a55e660a3647ee1e5c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:18 -0400
Subject: [PATCH 1068/1118] sigil: rebuild for Python 3.9

---
 srcpkgs/sigil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index c1392099583..b94cbfa6ff1 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,7 +1,7 @@
 # Template file for 'sigil'
 pkgname=sigil
 version=1.3.0
-revision=1
+revision=2
 wrksrc="Sigil-${version}"
 build_style=cmake
 pycompile_dirs="usr/share/sigil/python3lib"

From ed2f58a0850f7b9d0027ce9c3c25512e567058e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1069/1118] sip: rebuild for Python 3.9

---
 srcpkgs/sip/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 8f53db1cf10..87d0c5c6ed6 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,7 +1,7 @@
 # Template file for 'sip'
 pkgname=sip
 version=4.19.24
-revision=2
+revision=3
 hostmakedepends="python3-devel"
 makedepends="${hostmakedepends}"
 short_desc="Python extension module generator for C/C++ libraries"

From 971ceacc1b38bdacfab6f1abf715df84f14fa33f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1070/1118] sip5: rebuild for Python 3.9

---
 srcpkgs/sip5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sip5/template b/srcpkgs/sip5/template
index 2ea0bab7b65..cbbd61cbb73 100644
--- a/srcpkgs/sip5/template
+++ b/srcpkgs/sip5/template
@@ -1,7 +1,7 @@
 # Template file for 'sip5'
 pkgname=sip5
 version=5.4.0
-revision=2
+revision=3
 wrksrc="sip-$version"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"

From 60150aed11838c5fcad160720a93add3509c49ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1071/1118] speech-dispatcher: rebuild for Python 3.9

---
 srcpkgs/speech-dispatcher/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 7640cee91c0..829754ab3c7 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
 # Template file for 'speech-dispatcher'
 pkgname=speech-dispatcher
 version=0.8.8
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
 short_desc="High-level device independent layer for speech synthesis interface"

From 17d3d225090882f9b41f46fc6ad08ef3cdc0c93b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1072/1118] sssd: rebuild for Python 3.9

---
 srcpkgs/sssd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index 57a7fc7e2b4..082a56831ae 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
 # Template file for 'sssd'
 pkgname=sssd
 version=2.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-selinux --without-semanage --without-libwbclient
  --disable-cifs-idmap-plugin --without-samba --with-os=fedora

From 08e754d2455371b4b47e5e4873f0b82b6fdb9d9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1073/1118] streamlink: rebuild for Python 3.9

---
 srcpkgs/streamlink/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index ea68f0cea37..c92aaf1aea9 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,7 +1,7 @@
 # Template file for 'streamlink'
 pkgname=streamlink
 version=1.6.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-pycryptodome python3-pycountry

From 3e0a6224033637ab27aff0bdba8c4213ae6ae8b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1074/1118] subliminal: rebuild for Python 3.9

---
 srcpkgs/subliminal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index a5ec3dc3ac8..2e16355a28a 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,7 +1,7 @@
 # Template file for 'subliminal'
 pkgname=subliminal
 version=2.1.0
-revision=4
+revision=5
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 python3-guessit python3-babelfish python3-enzyme

From b6ffcee645d4130857457444235d4e34726f0a7a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1075/1118] subuser: rebuild for Python 3.9

---
 srcpkgs/subuser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subuser/template b/srcpkgs/subuser/template
index 0bc3e71db36..1d6aaa5d695 100644
--- a/srcpkgs/subuser/template
+++ b/srcpkgs/subuser/template
@@ -1,7 +1,7 @@
 # Template file for 'subuser'
 pkgname=subuser
 version=0.6.2
-revision=3
+revision=4
 archs="x86_64*"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 2e0bef9e8f3be0880d75927962925367b4617d8f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:19 -0400
Subject: [PATCH 1076/1118] subversion: rebuild for Python 3.9

---
 srcpkgs/subversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index d3806661e75..0f1d2d17900 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -4,7 +4,7 @@
 #
 pkgname=subversion
 version=1.14.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation

From 9c6e1212059d779f3b63944e22af1d521825c46f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:20 -0400
Subject: [PATCH 1077/1118] sumo: rebuild for Python 3.9

---
 srcpkgs/sumo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index 1167f97789c..4c1eb6876a4 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,7 +1,7 @@
 # Template file for 'sumo'
 pkgname=sumo
 version=1.5.0
-revision=2
+revision=3
 build_style=cmake
 python_version=3
 hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"

From 5e2ba1dab763c3a3f959acc54c1b9de66b6db7b8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:20 -0400
Subject: [PATCH 1078/1118] synapse: rebuild for Python 3.9

---
 srcpkgs/synapse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 357aa19550e..8da3b8f589a 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
 # Template file for 'synapse'
 pkgname=synapse
 version=1.20.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson>=1.2.0

From 58fb67b5cdd1d952286fb317a0e1c7fc7ffb359d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:20 -0400
Subject: [PATCH 1079/1118] targetcli-fb: rebuild for Python 3.9

---
 srcpkgs/targetcli-fb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/targetcli-fb/template b/srcpkgs/targetcli-fb/template
index 2088345b288..70ff44b77c1 100644
--- a/srcpkgs/targetcli-fb/template
+++ b/srcpkgs/targetcli-fb/template
@@ -1,7 +1,7 @@
 # Template file for 'targetcli-fb'
 pkgname=targetcli-fb
 version=2.1.51
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="configshell-fb python3-six rtslib-fb python3-parsing python3-gobject"

From 7f105d5bfa271ac1591e0f06cf1e1614d2c4a0c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:20 -0400
Subject: [PATCH 1080/1118] telepresence: rebuild for Python 3.9

---
 srcpkgs/telepresence/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telepresence/template b/srcpkgs/telepresence/template
index e3f446e828f..0f28d8f19c2 100644
--- a/srcpkgs/telepresence/template
+++ b/srcpkgs/telepresence/template
@@ -1,7 +1,7 @@
 # Template file for 'telepresence'
 pkgname=telepresence
 version=0.107
-revision=1
+revision=2
 archs="x86_64* ppc64le*"
 build_style=python3-module
 hostmakedepends="python3-pip python3-setuptools git"

From 9e212e72eedba3d775ecdd4020dd89d1303340c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:20 -0400
Subject: [PATCH 1081/1118] texworks: rebuild for Python 3.9

---
 srcpkgs/texworks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texworks/template b/srcpkgs/texworks/template
index 0ad5cc23e89..87ca8404934 100644
--- a/srcpkgs/texworks/template
+++ b/srcpkgs/texworks/template
@@ -1,7 +1,7 @@
 # Template file for 'texworks'
 pkgname=texworks
 version=0.6.3
-revision=3
+revision=4
 wrksrc="texworks-release-${version}"
 build_style=cmake
 configure_args="-DTW_BUILD_ID=Void -DWITH_LUA=ON -DWITH_PYTHON=ON

From c456bcee2ce2f5c2c5cb1162a3abe28a55a07a5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:20 -0400
Subject: [PATCH 1082/1118] tlsh: rebuild for Python 3.9

---
 srcpkgs/tlsh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template
index 14e6e9aa0b7..7cb5c28b48b 100644
--- a/srcpkgs/tlsh/template
+++ b/srcpkgs/tlsh/template
@@ -1,7 +1,7 @@
 # Template file for 'tlsh'
 pkgname=tlsh
 version=3.17.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-devel"

From fdb5bab69270a5bfaa0356b2035f42b7ec420092 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:20 -0400
Subject: [PATCH 1083/1118] torbrowser-launcher: rebuild for Python 3.9

---
 srcpkgs/torbrowser-launcher/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template
index 18418292fb1..81dec9dad3a 100644
--- a/srcpkgs/torbrowser-launcher/template
+++ b/srcpkgs/torbrowser-launcher/template
@@ -1,7 +1,7 @@
 # Template file for 'torbrowser-launcher'
 pkgname=torbrowser-launcher
 version=0.3.2
-revision=5
+revision=6
 archs="i686 x86_64" # limited by Tor Browser itself
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"

From bf867e3e7f3ae0ae336896c7ad817ed4da62823c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1084/1118] tox: rebuild for Python 3.9

---
 srcpkgs/tox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index 23d8d88564e..214ed60a03d 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,7 +1,7 @@
 # Template file for 'tox'
 pkgname=tox
 version=3.19.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-filelock python3-packaging

From 612543f26271538f1e22e403205aee742318ec28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1085/1118] trash-cli: rebuild for Python 3.9

---
 srcpkgs/trash-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/trash-cli/template b/srcpkgs/trash-cli/template
index 4ab724d8cb1..d1e28aca412 100644
--- a/srcpkgs/trash-cli/template
+++ b/srcpkgs/trash-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'trash-cli'
 pkgname=trash-cli
 version=0.17.1.14
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3"
 depends="python3"

From ba33c29b33e9a1ad889748401d685b83a8cf8936 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1086/1118] ueberzug: rebuild for Python 3.9

---
 srcpkgs/ueberzug/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ueberzug/template b/srcpkgs/ueberzug/template
index b54fb43be1b..ca27d90598c 100644
--- a/srcpkgs/ueberzug/template
+++ b/srcpkgs/ueberzug/template
@@ -1,7 +1,7 @@
 # Template file for 'ueberzug'
 pkgname=ueberzug
 version=18.1.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libX11-devel libXext-devel"

From 9afab39a9f62d2b482799a889c01531933c8ef4b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1087/1118] ulauncher: rebuild for Python 3.9

---
 srcpkgs/ulauncher/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template
index 141eb29b6c9..2802288b14a 100644
--- a/srcpkgs/ulauncher/template
+++ b/srcpkgs/ulauncher/template
@@ -1,7 +1,7 @@
 # Template file for 'ulauncher'
 pkgname=ulauncher
 version=5.7.5
-revision=1
+revision=2
 wrksrc=${pkgname}
 build_style=python3-module
 pycompile_module="ulauncher"

From 56fd8d6f1bbf7d832d48978dc39181cb695258a9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1088/1118] unicorn: rebuild for Python 3.9

---
 srcpkgs/unicorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unicorn/template b/srcpkgs/unicorn/template
index 971d44752ca..9134dca224b 100644
--- a/srcpkgs/unicorn/template
+++ b/srcpkgs/unicorn/template
@@ -1,7 +1,7 @@
 # Template file for 'unicorn'
 pkgname=unicorn
 version=1.0.1
-revision=3
+revision=4
 archs="x86_64* i686*"
 hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
 short_desc="Lightweight multi-platform, multi-architecture CPU emulator framework"

From d291d388ca3bd4b2a9262b852a47d76ebfc1df23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1089/1118] urh: rebuild for Python 3.9

---
 srcpkgs/urh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/urh/template b/srcpkgs/urh/template
index ed54ce8244e..d59f8587098 100644
--- a/srcpkgs/urh/template
+++ b/srcpkgs/urh/template
@@ -1,7 +1,7 @@
 # Template file for 'urh'
 pkgname=urh
 version=2.8.8
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython python3-numpy"
 makedepends="python3-devel python3-PyQt5 libomp-devel libairspy-devel librtlsdr-devel

From 362e60ef7d0598b7cb08a1a0bbaf314b6317527e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1090/1118] urlscan: rebuild for Python 3.9

---
 srcpkgs/urlscan/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/urlscan/template b/srcpkgs/urlscan/template
index 0c4ab9b75ad..dc2573b3187 100644
--- a/srcpkgs/urlscan/template
+++ b/srcpkgs/urlscan/template
@@ -1,7 +1,7 @@
 # Template file for 'urlscan'
 pkgname=urlscan
 version=0.9.5
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urwid"

From 65c8c43762d32189e48eae9b055ef5ac90fd22c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1091/1118] uwsgi: rebuild for Python 3.9

---
 srcpkgs/uwsgi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 2ad7432dae7..1446c355e1e 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,7 +1,7 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
 version=2.0.18
-revision=2
+revision=3
 hostmakedepends="python python3"
 makedepends="python-devel python3-devel"
 short_desc="Fast, self-healing application container server"

From 59c9013cbb665d9f99ce27920c0dc6b3d4354e30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:21 -0400
Subject: [PATCH 1092/1118] vapoursynth: rebuild for Python 3.9

---
 srcpkgs/vapoursynth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 521a73ab6b6..88a07c21c91 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,7 +1,7 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
 version=R50
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config libtool nasm python3-Cython"
 makedepends="python3-devel zimg-devel libmagick-devel libass-devel ffmpeg-devel

From fd1290834ca1384f82a4ca9639330f06d5413bd1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1093/1118] vim: rebuild for Python 3.9

---
 srcpkgs/vim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index cfeb4ec1ca6..ea4601505ed 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 version=8.2.1666
-revision=1
+revision=2
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel gtk+3-devel libXt-devel lua53-devel ncurses-devel
  perl python3-devel ruby-devel"

From aad81bc4fda2656d8d519642a7e37fafc2c8175d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1094/1118] vimiv: rebuild for Python 3.9

---
 srcpkgs/vimiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vimiv/template b/srcpkgs/vimiv/template
index 54deab7e7f7..0bc71d1261e 100644
--- a/srcpkgs/vimiv/template
+++ b/srcpkgs/vimiv/template
@@ -1,7 +1,7 @@
 # Template file for 'vimiv'
 pkgname="vimiv"
 version=0.9.1
-revision=4
+revision=5
 build_style=gnu-makefile
 pycompile_module=vimiv
 hostmakedepends="python3-setuptools python3-devel"

From 85d120fdfc9aab543b4aae11d6a1f9c4cb0a69b2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1095/1118] volctl: rebuild for Python 3.9

---
 srcpkgs/volctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template
index 235fddab23a..305e7e9ba1f 100644
--- a/srcpkgs/volctl/template
+++ b/srcpkgs/volctl/template
@@ -1,7 +1,7 @@
 # Template file for 'volctl'
 pkgname=volctl
 version=0.8.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject pulseaudio desktop-file-utils"

From 0b8a3c6c1fcb95586268946303bd09cc8f78be31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1096/1118] volk: rebuild for Python 3.9

---
 srcpkgs/volk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template
index cad07ce8c6b..2bbdd5b9b7a 100644
--- a/srcpkgs/volk/template
+++ b/srcpkgs/volk/template
@@ -1,7 +1,7 @@
 # Template file for 'volk'
 pkgname=volk
 version=2.2.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six"
 makedepends="boost-devel python3-cheetah3 python3-devel python3-Mako

From f055e981135a791802fe2a3a73e7bb07384d2de8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1097/1118] volume_key: rebuild for Python 3.9

---
 srcpkgs/volume_key/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volume_key/template b/srcpkgs/volume_key/template
index 746634526eb..64cc8f7d334 100644
--- a/srcpkgs/volume_key/template
+++ b/srcpkgs/volume_key/template
@@ -1,7 +1,7 @@
 # Template file for 'volume_key'
 pkgname=volume_key
 version=0.3.12
-revision=3
+revision=4
 build_style=gnu-configure
 make_build_args="PYTHON3_CFLAGS=-I${XBPS_CROSS_BASE}/${py3_inc}
  PYTHON_CFLAGS=-I${XBPS_CROSS_BASE}/${py2_inc}"

From a40cd0a2e6c97ee30d7f10ef07738f8327188040 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1098/1118] vtk: rebuild for Python 3.9

---
 srcpkgs/vtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index e48e91778a5..1b2051aba30 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=2
+revision=3
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
@@ -60,7 +60,7 @@ vtk-python3_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/bin/vtkpython
-		vmove usr/lib/python3.8
+		vmove "${py3_sitelib}"
 		vmove "usr/lib/lib*Python*.so.*"
 		vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
 	}

From 75c620f48d8de5cca25ee24e7a91c6e393883364 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1099/1118] weechat: rebuild for Python 3.9

---
 srcpkgs/weechat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 7f882016e21..8abf0745537 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=2.9
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON

From 555313cae9b63bd860f0554f3d7dafc75864b8e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:22 -0400
Subject: [PATCH 1100/1118] whipper: rebuild for Python 3.9

---
 srcpkgs/whipper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index 9e21890bf0a..03e5b89030b 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -1,7 +1,7 @@
 # Template file for 'whipper'
 pkgname=whipper
 version=0.9.0
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="libsndfile-devel python3-devel"

From 8d0fd0775e4df2689e3d079fa7b66bbd9422f35e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1101/1118] wxPython4: rebuild for Python 3.9

---
 srcpkgs/wxPython4/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index 7fc5b7a36a5..7060e894b0a 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
 # Template file for 'wxPython4'
 pkgname=wxPython4
 version=4.0.7
-revision=1
+revision=2
 wrksrc="wxPython-${version}"
 build_style=python3-module
 make_build_args="--skip-build"

From e7d47d8509674b217cd29c0ee895cc60926993e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1102/1118] xapps: update to 1.8.10

---
 srcpkgs/xapps/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template
index d1675b7168d..1589440927e 100644
--- a/srcpkgs/xapps/template
+++ b/srcpkgs/xapps/template
@@ -1,7 +1,8 @@
 # Template file for 'xapps'
 pkgname=xapps
-version=1.8.6
+version=1.8.10
 revision=1
+wrksrc="xapp-${version}"
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gnome-common pkg-config vala python3 gettext"
@@ -14,7 +15,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://github.com/linuxmint/xapps"
 changelog="https://raw.githubusercontent.com/linuxmint/xapps/master/debian/changelog"
 distfiles="https://github.com/linuxmint/xapps/archive/${version}.tar.gz"
-checksum=577a28bd8b02e6bdd52fcc1257d88ef738cdfc065fc5c8ed23554a002c4b0349
+checksum=a0d542de6dc4d6a318bdf1fad88447db270ab2dd0582f0c6f28008cc77337672
 
 xapps-devel_package() {
 	short_desc+=" - development files"

From 4d0be8edebf7fb96fc263653b41c948513a8d1c2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1103/1118] xen: rebuild for Python 3.9

---
 srcpkgs/xen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 158937ca75d..928ccb505ca 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.0
-revision=2
+revision=3
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64

From f559db7f97bbbd89c3fb98692a16166f381a2894 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1104/1118] xmldiff: rebuild for Python 3.9

---
 srcpkgs/xmldiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index 7cfdb79d749..8f252be2061 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -1,7 +1,7 @@
 # Template file for 'xmldiff'
 pkgname=xmldiff
 version=2.4
-revision=2
+revision=3
 wrksrc="xmldiff-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From df6d740173823754f5abb0218f4b4299255896e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1105/1118] xonsh: rebuild for Python 3.9

---
 srcpkgs/xonsh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template
index d15917d61a7..1aaf2f5f96a 100644
--- a/srcpkgs/xonsh/template
+++ b/srcpkgs/xonsh/template
@@ -1,7 +1,7 @@
 # Template file for 'xonsh'
 pkgname=xonsh
 version=0.9.22
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 short_desc="Python-powered, cross-platform, Unix-gazing shell"

From 45e2ef35ea11586829b5ba09cea4696a8b489c3b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1106/1118] xpra: rebuild for Python 3.9

---
 srcpkgs/xpra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index b14709c33e6..77eb3a4fbfa 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,7 +1,7 @@
 # Template file for 'xpra'
 pkgname=xpra
 version=4.0.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="pkg-config python3-Cython"
 makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel

From 15001c1b2f49878d8e775233c096b7e61a8df77c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1107/1118] youtube-dl: rebuild for Python 3.9

---
 srcpkgs/youtube-dl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 6ff04a36721..84c6b2eab8b 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,7 +1,7 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
 version=2020.09.20
-revision=1
+revision=2
 wrksrc=youtube-dl
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5f40b01b9349f16f39cfae67da1727ad72b79d8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1108/1118] yq: rebuild for Python 3.9

---
 srcpkgs/yq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index 100dc4be7dd..2ad24598f3f 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -1,7 +1,7 @@
 # Template file for 'yq'
 pkgname=yq
 version=2.11.1
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-yaml"

From 78d7a91d189c22d1819fdaea88475bdeaefd0387 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:23 -0400
Subject: [PATCH 1109/1118] yubikey-manager: rebuild for Python 3.9

---
 srcpkgs/yubikey-manager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
index 15db9d4f7ef..20368e5b2ad 100644
--- a/srcpkgs/yubikey-manager/template
+++ b/srcpkgs/yubikey-manager/template
@@ -1,7 +1,7 @@
 # Template file for 'yubikey-manager'
 pkgname=yubikey-manager
 version=3.1.1
-revision=3
+revision=4
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="libu2f-host python3-fido2 python3-openssl python3-usb python3-pyscard

From 0d2d5eea1a11e292cc2a708508584a1f0b6d7f0b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:24 -0400
Subject: [PATCH 1110/1118] z3: rebuild for Python 3.9

---
 srcpkgs/z3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 32707a2fe40..64965043749 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.9
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From cd9addf76b764a36614f2a1750907243e0c68df2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:56:24 -0400
Subject: [PATCH 1111/1118] znc: rebuild for Python 3.9

[ci skip]
---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index af2192d499a..94142619d1c 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-python

From 78facc24f44dfea2c830f206f78813720701a16d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 11:35:29 -0400
Subject: [PATCH 1112/1118] fixup! cairo-dock-plugins: rebuild for Python 3.9

---
 srcpkgs/cairo-dock-plugins-python2  |  1 -
 srcpkgs/cairo-dock-plugins/template | 16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/cairo-dock-plugins-python2

diff --git a/srcpkgs/cairo-dock-plugins-python2 b/srcpkgs/cairo-dock-plugins-python2
deleted file mode 120000
index 3f919c136ba..00000000000
--- a/srcpkgs/cairo-dock-plugins-python2
+++ /dev/null
@@ -1 +0,0 @@
-cairo-dock-plugins
\ No newline at end of file
diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 6f28bf559a6..1086ee328e4 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -4,11 +4,9 @@ version=3.4.1
 revision=13
 build_style=cmake
 hostmakedepends="gettext pkg-config"
-# XXX libetpan, libdbusmenu, etc
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
- libical-devel libxklavier-devel zeitgeist-devel libsensors-devel
- cairo-dock-devel gnome-menus-devel vte290-devel vala-devel vala
- python-devel python3-devel upower-devel"
+ libical-devel libxklavier-devel zeitgeist-devel libsensors-devel vala-devel
+ cairo-dock-devel gnome-menus-devel vte290-devel python3-devel upower-devel"
 depends="cairo-dock>=${version} upower"
 short_desc="Plugins for cairo-dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +17,7 @@ checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
 patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python-devel python3-devel vala"
+	hostmakedepends+=" python3-devel vala-devel"
 fi
 
 CFLAGS="-fcommon"
@@ -32,14 +30,6 @@ pre_configure() {
 	echo -n > logout/CMakeLists.txt
 }
 
-cairo-dock-plugins-python2_package() {
-	depends="python ${sourcepkg}>=${version}_${revision}"
-	pycompile_module="CDBashApplet.py CairoDock.py CDApplet.py"
-	short_desc+=" - python2 bindings"
-	pkg_install() {
-		vmove ${py2_sitelib}
-	}
-}
 cairo-dock-plugins-python3_package() {
 	depends="python3 ${sourcepkg}>=${version}_${revision}"
 	pycompile_module="CDBashApplet.py CairoDock.py CDApplet.py"

From 96e47de77ed42ecf7eb948344d172c406a3c1628 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 11:35:46 -0400
Subject: [PATCH 1113/1118] fixup! SoapySDR: rebuild for Python 3.9

---
 srcpkgs/SoapySDR/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/SoapySDR/template b/srcpkgs/SoapySDR/template
index a380dfb5845..8d7bfc99778 100644
--- a/srcpkgs/SoapySDR/template
+++ b/srcpkgs/SoapySDR/template
@@ -4,7 +4,8 @@ version=0.7.2
 revision=2
 wrksrc="${pkgname}-soapy-sdr-${version}"
 build_style=cmake
-hostmakedepends="doxygen swig"
+configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3"
+hostmakedepends="doxygen swig python3"
 makedepends="python3-devel"
 short_desc="Vendor and platform neutral SDR support library"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"

From b696d0e66f2b6867ca58ed2b84d4f6b3d6627f96 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 11:36:13 -0400
Subject: [PATCH 1114/1118] fixup! python3-pandas-msgpack: rebuild for Python
 3.9

---
 srcpkgs/python3-pandas-msgpack/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/python3-pandas-msgpack/template b/srcpkgs/python3-pandas-msgpack/template
index 5eed8fc3c76..f084c711e78 100644
--- a/srcpkgs/python3-pandas-msgpack/template
+++ b/srcpkgs/python3-pandas-msgpack/template
@@ -13,7 +13,6 @@ license="BSD-3-Clause"
 homepage="https://www.pf4sh.eu/git/pulux/pandas-msgpack/"
 distfiles="https://www.pf4sh.eu/git/pulux/pandas-msgpack/archive/${version}.tar.gz"
 checksum=e01b1158c66265315338657310ac42edac81b33a5b178a68b29adcf2aeefd22e
-nocross="python3-pandas is nocross"
 
 post_install() {
 	vlicense LICENSE.md

From fa735c99cb468365f92fc53bc036fc51022aade4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 11:36:34 -0400
Subject: [PATCH 1115/1118] fixup! vimiv: rebuild for Python 3.9

---
 srcpkgs/vimiv/template | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vimiv/template b/srcpkgs/vimiv/template
index 0bc71d1261e..80b0a104e1a 100644
--- a/srcpkgs/vimiv/template
+++ b/srcpkgs/vimiv/template
@@ -1,10 +1,10 @@
 # Template file for 'vimiv'
-pkgname="vimiv"
+pkgname=vimiv
 version=0.9.1
 revision=5
-build_style=gnu-makefile
-pycompile_module=vimiv
+build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
+makedepends="python3-devel"
 depends="python3 gtk+3 python3-gobject"
 short_desc="Image viewer with vim-like keybindings"
 maintainer="Dawid Sowa <dawid_sowa@posteo.net>"
@@ -12,3 +12,20 @@ license="MIT"
 homepage="http://karlch.github.io/vimiv/"
 distfiles="https://github.com/karlch/vimiv/archive/v${version}.tar.gz"
 checksum=7196341c41ad372f4d5d98bc96fba4aa55ad6e78d93afd617a62866bdaa6c087
+conf_files="/etc/vimiv/*"
+
+post_install() {
+	vlicense LICENSE
+
+	vinstall config/vimivrc 0644 etc/vimiv
+	vinstall config/keys.conf 0644 etc/vimiv
+
+	vinstall vimiv.desktop 0644 usr/share/applications
+
+	vman man/vimiv.1
+	vman man/vimivrc.5
+
+	vinstall vimiv.appdata.xml 0644 usr/share/appdata
+
+	./scripts/install_icons.sh ${DESTDIR}
+}

From 7d66b86af25b0330677ddf09ff060056cecc8366 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 12:30:55 -0400
Subject: [PATCH 1116/1118] fixup! python3-orocos-kdl: rebuild for Python 3.9,
 fix breakage with sip

---
 srcpkgs/python3-orocos-kdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template
index 20341a9fd17..728ed73d780 100644
--- a/srcpkgs/python3-orocos-kdl/template
+++ b/srcpkgs/python3-orocos-kdl/template
@@ -5,8 +5,8 @@ revision=3
 wrksrc=orocos_kinematics_dynamics-${version}
 build_wrksrc=python_orocos_kdl
 build_style=cmake
-configure_args="-DPYTHON_VERSION=3"
-hostmakedepends="python3 python3-sip"
+configure_args="-DPYTHON_VERSION=3 -DSIP_EXECUTABLE=/usr/bin/sip"
+hostmakedepends="python3 python3-sip sip"
 makedepends="python3-sip-devel python3-devel orocos-kdl-devel eigen3.2"
 depends="python3 python3-sip"
 short_desc="Python3 Bindings for Orocos Kinematics and Dynamics C++ library"

From 5a50f4725a1cbc112d05e41bf3ea8b798e4cddb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 13:13:13 -0400
Subject: [PATCH 1117/1118] fixup! python3-pyspotify: rebuild for Python 3.9

---
 srcpkgs/python3-pyspotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pyspotify/template b/srcpkgs/python3-pyspotify/template
index 478d94a2338..de246d9fc9c 100644
--- a/srcpkgs/python3-pyspotify/template
+++ b/srcpkgs/python3-pyspotify/template
@@ -4,7 +4,7 @@ version=2.1.3
 revision=2
 wrksrc="pyspotify-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-cffi python3-pycparser"
 makedepends="python3-setuptools python3-devel libspotify-devel"
 depends="python3-setuptools python3-cffi"
 short_desc="Provides an interface to Spotify music services"

From da6e827e5655d9c167e19cc3bce0f0c82b527bfe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 9 Oct 2020 13:48:44 -0400
Subject: [PATCH 1118/1118] libspotify: fix disparate versioning for armv6l

armv6l provides a different libspotify version than all other archs.
Commit 35ff97c5cd04ceceeaec389ef7fe972b7f1ee6cf attempted to version the
armv6l package based on the library version, but the disparity breaks
xbps-src when trying to rebuild the dependant python3-pyspotify.

[ci skip]
---
 srcpkgs/libspotify/template | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libspotify/template b/srcpkgs/libspotify/template
index a6dac136108..9888a207729 100644
--- a/srcpkgs/libspotify/template
+++ b/srcpkgs/libspotify/template
@@ -1,14 +1,15 @@
-#Template for the 'libspotify'
+# Template file for 'libspotify'
 pkgname=libspotify
+reverts="12.1.103_1"
 version=12.1.51
-revision=1
-short_desc="Spotify library for building your own streaming apps"
-maintainer="noah <nsawyer1993@gmail.com>"
+revision=2
 archs="x86_64 i686 armv5tel armv6l armv7l"
 wrksrc="libspotify-${version}-Linux-${XBPS_TARGET_MACHINE}-release"
-repository="nonfree"
-license="custom"
+short_desc="Spotify library for building your own streaming apps"
+maintainer="noah <nsawyer1993@gmail.com>"
+license="custom:Proprietary"
 homepage="https://developer.spotify.com/technologies/libspotify/"
+repository="nonfree"
 _libspotify_mopidy="https://github.com/mopidy/libspotify-archive/raw/master"
 
 if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ]; then
@@ -22,10 +23,12 @@ elif [ "${XBPS_TARGET_MACHINE}" = "armv7l" ]; then
 	wrksrc="libspotify-${version}-Linux-armv7-release"
 	distfiles="${_libspotify_mopidy}/libspotify-${version}-Linux-armv7-release.tar.gz"
 elif [ "${XBPS_TARGET_MACHINE}" = "armv6l" ]; then
-	version=12.1.103
-	wrksrc="libspotify-${version}-Linux-armv6-bcm2708hardfp-release"
+	# Even though the library version is different, xbps-src breaks if
+	# the versioning of packages across archs is not consistent
+	_libversion=12.1.103
+	wrksrc="libspotify-${_libversion}-Linux-armv6-bcm2708hardfp-release"
 	checksum=d658e6c1978fb46cf33376eb8367a51d024f4014f21beac1dd264532bcc54b24
-	distfiles="${_libspotify_mopidy}/libspotify-${version}-Linux-armv6-bcm2708hardfp-release.tar.gz"
+	distfiles="${_libspotify_mopidy}/libspotify-${_libversion}-Linux-armv6-bcm2708hardfp-release.tar.gz"
 elif [ "${XBPS_TARGET_MACHINE}" = "armv5tel" ]; then
 	wrksrc="libspotify-${version}-Linux-armv5-release"
 	checksum=4d96efcb1423864683917f40fb4df481491250a76cb29be3a235b3732a64fefc

  parent reply	other threads:[~2020-10-09 18:02 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-07 14:09 [PR PATCH] " ahesford
2020-10-07 14:22 ` [PR PATCH] [Updated] " ahesford
2020-10-07 17:17 ` ahesford
2020-10-07 18:02 ` ahesford
2020-10-07 18:50 ` ahesford
2020-10-07 19:27 ` ahesford
2020-10-07 20:04 ` ahesford
2020-10-08  0:15 ` [PR REVIEW] " sgn
2020-10-08  0:18 ` sgn
2020-10-08  0:30 ` [PR PATCH] [Updated] " ahesford
2020-10-08  0:31 ` [PR REVIEW] " ahesford
2020-10-08  0:31 ` ahesford
2020-10-08  2:57 ` [PR PATCH] [Updated] " ahesford
2020-10-08  5:33 ` ahesford
2020-10-08 13:55 ` ahesford
2020-10-08 13:57 ` ahesford
2020-10-08 14:00 ` ahesford
2020-10-08 16:56 ` [PR PATCH] [Updated] " ahesford
2020-10-08 17:59 ` ahesford
2020-10-08 18:03 ` ahesford
2020-10-09 18:02 ` ahesford [this message]
2020-10-09 18:46 ` ahesford
2020-10-09 20:42 ` ericonr
2020-10-09 20:45 ` ericonr
2020-10-09 20:55 ` ericonr
2020-10-09 22:16 ` ericonr
2020-10-10  3:37 ` ahesford
2020-10-10  4:27 ` [PR PATCH] [Updated] " ahesford
2020-10-10  5:00 ` ahesford
2020-10-10  5:15 ` Python 3.9 [ready to merge] ahesford
2020-10-10 14:25 ` [PR PATCH] [Updated] " ahesford
2020-10-10 14:28 ` [PR PATCH] [Merged]: " ahesford

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201009180253.-DGTelZgcTZVEVSXt-cQdI7RY0vskbKnkSY1mMy48vM@z \
    --to=ahesford@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).