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: Thu, 08 Oct 2020 07:33:01 +0200	[thread overview]
Message-ID: <20201008053301.0OLKM_PVwqL_9WICn8wVh31zVi0ITlrrCneWrRLLZr4@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: 1233927 bytes --]

From d1a08b4cfdc22058198dbc359aeef948e3d6b601 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/1112] 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 c784cacfe0bc8876e8043796a04b21d3ffee3041 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/1112] 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 2a0ecbd887dd5a889728e6ce7acf16dfd60e84bd 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/1112] 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 fd33f6bf5fb8f6948c06976d86c99e0586d8f554 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/1112] 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 961a2842f344ec8be9ab6836827cf5472c336855 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/1112] 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 c828dd8d807dc64f82bd705f37603dfcc0986f9d 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/1112] 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 4eaaf6fc33513ef8f9cb417646c27cb5d7d25e82 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/1112] 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 beba904091a9c4f6f65c22941f31d614ff71983e 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/1112] 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 5cf0f2f197f1510dbb200d2f3107daf7495673f4 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/1112] 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 e536f5c2b0ae220fb5b2edc7e2ed9ec595764aa8 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/1112] 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 85f05cf3814b5e1458c33519dd86e11401a72c6e 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/1112] 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 a7a33c8832d533eb8e13fd32404c3e014aec13d7 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/1112] 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 c0a8ab6709f21b93eb928edcdf413c85f0f968be 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/1112] 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 97e7d675423fb95464ee8fa040e01ae27c8ba83c 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/1112] 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 11e6c372244d06b5d028d0df278f425edbc2c40e 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/1112] 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 47b49fdc51e371ee38f65e6307421a768cf63711 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/1112] 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 10d213474d3f3deaa90deed28969cd6be1ceb8f4 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/1112] 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 9ca8fbcc8960225ea94fb2ab41eadaf922ec77c6 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/1112] 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 55a7885a2dc8725a7a0b0127fcb28b792ebfdbcd 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/1112] 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 ddd9ec9c2dada607818bcdde89ff6a220f8205fc 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/1112] 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 ae385c16109f1215d512b884513778cceadd6e99 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/1112] 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 b312d9156d1dd0c13cd8833e6fe6442f173a100e 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/1112] 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 6a5f0c1662eaa255c8532b05c46019a32c88c2f1 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/1112] 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 ae21c6121f7196c7e04605a6b47f7e27906b816c 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/1112] 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 68e332d867f3e9306e1c1054b95d9bc5b5f0ffcc 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/1112] 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 3cd16941d0eaf8556806d8297463ca336c7379d8 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/1112] 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 3e766c7090db4406f74551330823daaf4e4fbd3f 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/1112] 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 f37da4e73fefa7a9ab7677c5eca9b775b6c884d7 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/1112] 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 2688c7a5c52411c62b2043a69c3f553374828bb9 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/1112] 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 39220779ff27d1aa035fbd0cbc2c8a0068f75f16 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/1112] 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 542166569ad9b4c28fe67113624555d9f1c2aea7 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/1112] 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 60117a2329b6cf7c600ae78ef2c7fce495e29180 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/1112] 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 56ad8a73c95edc5f4840e87e5de97fb203133ba9 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/1112] 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 5ed938cbf5c705d45d6bd04f663b0a13c4d0454e 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/1112] 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 e76633529edf63b491b190df4b9a753f0c0bd08a 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/1112] 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 6b41619ab4e183276954a8af2505d7c0df0d3168 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/1112] 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 ec0e60226a21b4bceb0233354eced773af4c9b57 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/1112] 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 cc2307009d96599aed74528e86953f78333b020e 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/1112] 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 9acd476f85a288b5addf46092f0d3a3a2f892cc3 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/1112] 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 cd576e339039179a119ecd4750ae28c9b1c47c61 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/1112] 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 1bbfecf729f25ce1c16fdfc18c707b4b15ff56c5 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/1112] 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 dd179b3faecfbe9e9635575205942ca7bfb4a20d 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/1112] 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 1e88d7e835d52779b260a40875c1706321258cd1 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/1112] 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 0dfa3451d1001372d43c4ce04e7ad8f51aaad750 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/1112] 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 68411fe82eb4b17806b4ff5127ba251021fd1066 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/1112] 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 2c4a8c45c8e62d9183ee1c27b0bb6b9d06949fa5 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/1112] 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 d5c7fedc571d66600b70882c528f1269ce7971b8 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/1112] 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 b003a949e8bd8e40372b9f77a3307abf65b828ca 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/1112] 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 e0e9eee36419b28d52552c8daa333888916f67a4 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/1112] 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 946b96a1155d55216bc86cdf37574865371287ad 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/1112] 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 aff8169fc91dd432d50eaabf3b7e6eacf583f765 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/1112] 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 40e52585be9a2246140333383fea1d70bdd2e004 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/1112] 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 efb964ac47b483f2fc9b30f035ccd036284598da 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/1112] 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 79525c1b3817743ed5513c29d06fd54fde07fd6a 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/1112] 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 2afb8bd7a0d5e1e12227c4e1198323cd93c7f783 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/1112] 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 a3b6cab923a4ec67baa45014a294ce8602251712 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/1112] 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 4db8500112ac1538fe816274820718d4685e9a18 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/1112] 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 8906a572bffb4feb30d7a3954d0cde11f9e70e70 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/1112] 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 c0230521ef92ed2f8bb695802db28d64f7505ef3 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/1112] 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 50df89f3c30d9cce7bc1090f05ddc858e632809a 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/1112] 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 ab772f1ca38ad29798815d44b5168fc4ea1293dc 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/1112] 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 032b93191d9104eb73d6fc138dde795d82e094dd 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/1112] 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 77c0eb764dadacdc5c3063216ff3057193677150 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/1112] 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 fa244e429fa4f6b4e48b66833e75cfcc72c44f37 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/1112] 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 bbda443098033d8c4539690d020fbba754e8d3d8 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/1112] 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 a5909be961eedfbd614b348dc848e735a04343fa 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/1112] 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 14d13769b935ba0b122b5f486eed43afacaa04da 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/1112] 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 da6a5974e947ef72e4c5e634cdf2ae849a4bda55 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/1112] 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 25829509f5becf62bb6dd5f74c8564d7b8122833 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/1112] 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 ce5b31ad34d242ece60b4401e797527e8670883b 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/1112] 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 3d6b623d655c5976f52d8c19873791643b4ada1f 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/1112] 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 624975cabe451febbb4ecb85aef4e4788d4f90a4 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/1112] 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 f4367f12c82e52010006961b6ee415b2d1c5e872 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/1112] 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 eeb33ff858b2eb1db396f75ef8dd63cd63c83edc 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/1112] 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 4d5c5e43ffa3ebdbe21ab647230d20b0dc6a2960 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/1112] 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 b11617762639e7fbedc957003fc55a22eda82910 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/1112] 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 23e0741d03a5c9814e9176fcec2356c2bf670e6f 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/1112] 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 7edf1076d2eeeeb4d09447ff4bc8600054ebf045 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/1112] 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 e1517b90cfa363678d7de3985d63c5e0d906cf1a 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/1112] 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 1b4e733bc94d8df0dc0535259e19fbfb5e802360 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/1112] 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 5fe2afffdcb29fcd8086c8389116a18ad127e6d6 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/1112] 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 969784fcbe36bfbffd9691a801da8e1b09d813d8 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/1112] 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 436194f0c159573219326450bc34b421120dc2bd 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/1112] 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 210e3ab5f013c7bdb52d1b8f314f9451e398248c 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/1112] 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 ba1a73f616f3c04269e6718d03ad905760700bde 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/1112] 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 c8a098d0acce7292cea345f5ba5746e3c288c655 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/1112] 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 4bbf69ce9ba4036583eb052e76db68f41405b528 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/1112] 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 d2371cfbea251792e7bbdfa33198e66b183fa1c0 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/1112] 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 19638683e0d183a5d52c6ebff2e9bc3fa65325af 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/1112] 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 695c70d2cc12620d7c3dd47438b27a05961c70dd 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/1112] 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 69d0fc3db7c4c152ca5bee56252cdc1c0df9fe91 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/1112] 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 416a57e559c8ac91edc27c22c8902275a1faa11f 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/1112] 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 57b734a7098b7f6b533c290a09ecfd19a70991d7 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/1112] 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 71ea59999615ad05295ab79c3eb19b5793e36b89 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/1112] 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 ecbd3770caf66694f589c437ce98bf2922749f30 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/1112] 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 9a5440171b37b160d986bcb22b4f9c63d9e93492 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/1112] 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 5e216a37e9d20a45d05cffab57239c39f5f3a03f 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/1112] 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 b475de66db8e2756185cfdb3d88ea9cf64cca6ef 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/1112] 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 821dfcd40d867bc98e109c7c40007c4a9dcdb52f 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/1112] 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 b089bd222bb3855b460bd7f8220b72b66584f10b 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/1112] 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 a3c5c1470a9cf134fc11f1be00a3a62b2a59d504 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/1112] 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 2e0e25954b19d8b038cd3cfb7b0f523df3aed89b 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/1112] 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 f9cefa0184673daccecd60c8fd89921abdc4cf70 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/1112] 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 6b915a3fabb0210d9b20f8b5bab6cb02512f12a9 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/1112] 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 03a7a5d5aee0b7ae1ab97b71f63c09109b18282c 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/1112] 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 5455d2725ab9b3328e88bfab8716ac92ffbe387e 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/1112] 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 eddc53955fca440d36403045092b81e203abacf5 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/1112] 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 7f8679b44926aa2dcf873022f078a29b647ccab9 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/1112] 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 6bc2431a60405d5d133b77215f7b5be85d7d68d3 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/1112] 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 477f5972d4ed4a4749d19237fe66dc3bb59e4261 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/1112] pocky: 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 ccb71ac4eb5d5576617b5851eb98299e48ce0ee2 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/1112] 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 852e1caa2ba4ea294593abd6c0dfd764c8c5fa6e 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/1112] 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 0fca635d962092e653ccaa6b02b2c207d06b0c38 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/1112] 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 d7a6c7d05fb01b4adc03d665b446ac2ada26c9ae 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/1112] 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 8541fb09edf2ea65214eba29a67b53c5171ce886 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/1112] 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 9cd5f93d641e65b2bf5514922b22e38a3148e9af 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/1112] 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 002303c10b64f22bfed16373ae133802af4b3f63 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/1112] 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 e212bf76efdc6942e7468ee9acaaa8baaac9d6c6 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/1112] 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 9c06e61ee5afb37a2a0a2727bb318062e4fbddee 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/1112] 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 9a3f21c3922e5e13f6a160b1a476e666ad08f926 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/1112] 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 34a97f22bb0a901cd940141bd321c76f9a977f16 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/1112] 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 87e83cdaf70f54c5aa47ecbcb2a2949ed3f52fb4 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/1112] 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 3a9a26a6a23c03947b44f2dce544136c358232f5 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/1112] 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 6729859d32f33237b3987aaeffb6bc6b9fbfc4ee 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/1112] 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 829860d15e55641d5bc91897584cd05d47fa9c3c 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/1112] 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 2eb3d90d321a9fb7f0221ff0a9406d17f61807ca 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/1112] 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 3be7a83830b62f187232da09444b9ddd63b36504 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/1112] 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 8fb7e21d6eac8541cf7eef5d4df3f795edd62101 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/1112] 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 a5b107223a7d059c17055d73c205a6996f0553c2 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/1112] 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 79716f56b0d6c50125e75c4e6bcae2f285323f23 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/1112] 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 bf0e6c008d96e12f773edd6983d6950d6fa7d57d 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/1112] 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 75ac033dc24bb842096182c26741faf875c40f7f 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/1112] 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 fc2e7be682713ad41b07cb75bd06d67c2ca99a32 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/1112] 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 446c5fd264d25ee3fa4693b48c0bff411421f337 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/1112] 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 65e86a56b77d54f075d1c553de8b1d35a46d2c41 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/1112] 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 06658a4a728d87cc3ae51b66a0785e6ef70721b1 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/1112] 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 27b2836f0ab9d7e935c9d5d77d60e327c3544952 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/1112] 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 18934fe63ad24415201e33bb89491770d381f6e6 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/1112] 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 5581156a9009a94c4e207ef8061f7c604e20db2d 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/1112] 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 8f4aef5b81b680e334ec58b00b61e91628ad5ede 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/1112] 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 ca83350a00760fb7dbf297667a7f76a93a544cbe 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/1112] 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 2b5462cf59dd9fc071907dcb1471c91059609889 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/1112] 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 c9d1cc018c834a1f67f37d2aac43334dd841baa4 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/1112] 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 c63c3b33d94c70b629d82ddc2b5ade03782ccc8a 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/1112] 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 ee09ed512767c754e117dc85008910cd15d449e3 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/1112] 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 de55a952fa55b80d570bba52bb75e31fc5aadae9 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/1112] 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 78b48010d850b01cb567e5de6439ab4166520d2b 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/1112] 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 e47f1b0793e6296f690863007fd558dab30fe213 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/1112] 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 e67c85c093c571b4ca18aecea52c8daf6e488242 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/1112] 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 e6801ea3040a831b9336ae8dce67ff3ea77bb498 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/1112] 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 108456cadd5035f0620fead47b12b530fe08e0b8 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/1112] 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 e9f49cbd7a2b47c98bbb3384a6bb3550d5b1bc54 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/1112] 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 dd59e132f6626da693b1d1e93f8f2f1e61887b71 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/1112] 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 877232db498678ce8538f0eb1da604cfb06530c7 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/1112] 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 132b8143fce4c34d4fb6e3b775433955f7e0175c 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/1112] 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 37fd8cbfa456b77b0f1158a8c53b92f2c45f3f40 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/1112] 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 749341d137366e523c7d3c91f7625c13d98199f4 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/1112] 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 8e0d5a77882dd53e242a7c5af302c6fb7c24286f 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/1112] 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 75fcdd60050cfd109dcb7bb7fbdd26e110d17c72 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/1112] 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 cd38b34abd9ca342fb84f158a31be4369a09c612 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/1112] 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 f5b4e0a62066e5b2e64a1bcad12cbcf08c47e176 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/1112] 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 2bc4a983e767dfbda20414ac70dc44373f98a180 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/1112] 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 45cb8fd0930cf747d1166cc0e9725a574aa4ff8c 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/1112] 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 cfc71357c0733fedf808e1bc47022ab0e22ed500 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/1112] 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 a608f5e8bbb0d7042ac849b7a3fb9a084110b0aa 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/1112] 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 f6830c67e66273516d800d607f9f709acef39dae 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/1112] 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 71b74d76380c261acdc3d45ccd5dc75a001b78e4 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/1112] 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 8a7ea16d796cff10d16121ace2acd96e41e7e59b 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/1112] 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 8c9ed69de1377deb6e9dbaf9b87fdd352a34f088 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/1112] 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 873614edb574dff2104bfa79d9ec89707a0f13c9 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/1112] 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 4ab9f58da3f7b19bfdf5635acc13ed4461b59608 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/1112] 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 b472fe133dcc8cde9d05e719de8b1e6aceea3321 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/1112] 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 bd00d37997d20014d1269fdf9b7296933a5ff2e1 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/1112] 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 d19d357070af7de05c90ef08302b7e935e11e0e9 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/1112] 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 8e6e875ffbcd4d1242dbf415123d6210486b62a5 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/1112] 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 eefc54e2c4d6b541e6b42eb4bcbfa649e7f5c86d 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/1112] 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 ed4b62cd188334db0dadb304b2ea3c4ca5f4593a 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/1112] 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 5eb5caad00011dbb2f7ba592332ffecb7a1fd9d2 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/1112] 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 9daf1f8414f4f5e87010cbedef1887c922de1cf3 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/1112] 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 a8686db8f8350a19ba6169b0eab33441cb916975 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/1112] 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 1ae96125d21d78e3a044f24b80314bc6220235bb 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/1112] 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 b2dab7d9b6d4c1e6d83ffd37c5a34f3c23ed2248 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/1112] 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 3e8f23750f1e8b3f4fe3f54dcb3b8a289949100c 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/1112] 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 55057758dc529fc08183626ac330891007e06a4e 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/1112] 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 d8df7f77f5067276997ae8db7e9ac470c72a411e 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/1112] 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 58924b6281d43a790199428b7cb36a25d83ce3b5 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/1112] 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 061c39354620e9e66885fad2b7148b4a93901622 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/1112] 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 c223e1d7ea4daca79957cb21572eca6fb9343e7c 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/1112] 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 da849e86b9c3a7c0923db4691bd00c64c5230c87 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/1112] 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 2f1dd7667725412de65e11c1d5fd28cf78305576 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/1112] 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 7185168d709a19b6d0537b068b3a204d10b2f9af 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/1112] 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 496b941b8d988ea8f2c5fef5130981a9335a9d9d 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/1112] 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 ed2744de90b4d1c3998cf0fed714d6e0886e1931 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/1112] 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 dcdd891b961cb5125a9a0c9a5139cc4b4d21dbbf 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/1112] 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 e21c760c65249191371883896032b44d1d1a3cca 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/1112] 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 27f973c13d7272650489a5d26a93ed6b07e632a6 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/1112] 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 d74501fbd0a1f8896047eda0b084d62187ecf7b0 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/1112] 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 179b7ae3bdb868b0220f0f309073ae65ce629085 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/1112] 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 b6a513c0dec828fd6931eed543f0e198d3a5e44b 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/1112] 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 8dab62fbdf7bc4bd58a7642c468f870e0eaca9e1 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/1112] 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 d8486b6987981b05fe695d3872c4ff525466ecfb 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/1112] 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 8343e58548907ffb362ef9e4a9e30d6c6f60ff32 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/1112] 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 15f33ee755ff773d68d656a722027be470f37faf 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/1112] 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 33750518417b380b2582c3e061f088ee367d25ba 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/1112] 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 1af43f3c55840bfc41cc1cf5651e7360125973a9 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/1112] 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 b882117c88c6ce953c809cc535e8e6b91929a8a9 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/1112] 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 83e2177bd894ae7b6df6e38f7eeaf7211c977038 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/1112] 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 ac4d675957a4eb0a3c8e8ec3eb31855df6284e44 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/1112] 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 da5ab5e57f12dec5c1a18aa1c4737416ab404f7b 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/1112] 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 9c16dcd5429770623882cbd5b523be85ff09335d 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/1112] 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 1096c7dd757da466a8c2bf3c012e49a8d3351ff2 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/1112] 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 d9803c2d5eee5aa6327b8a13f62b1a615690bd74 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/1112] 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 551393fbfc4804f00a93e9c8e0c7d220bc2fbabe 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/1112] 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 049325627d5c2f29d70ebadce1bf85361ef8be74 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/1112] 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 bca4693ec04e4c2ecf48c4a1f6dd87ccf1c799ce 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/1112] 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 dd09647314f16b949528c38f4350ac9d71d4139b 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/1112] 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 0a783a5eac6b91ad97f69248b1d8dff1ef8baebe 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/1112] 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 d0fd653852916226331ed573fbcf45eef8eed031 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/1112] 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 616e8ff323ee6b59af61adc4add4d7c80c75cfbd 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/1112] 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 cba16f4ff3c7e2fe40a869aa1ff72c5af9e569ca 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/1112] 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 6595576b8c55721b4bfa5fe6d6d24b5413922751 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/1112] 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 6320aec3beafa3d6d531795ca153c3b1497653d1 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/1112] 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 962bb19cadd51313fe6da0e68f0e18c867b8332f 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/1112] 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 8c19bf07f5d631a14cb697fd48fc79c8305f9c4f 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/1112] 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 bb7df1754f416487c107d9e705c6492a425b078f 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/1112] 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 d937567e16bbe58adaa224eb568122ba6b74835c 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/1112] 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 b55e6f7ffe1d3143200b6d93f689d604df0fe9fc 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/1112] 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 bd5db6718c3ada8ad55a1659a98c8d420123edbb 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/1112] 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 66c7319526be381aaadafa1740097416c21e52cb 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/1112] 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 38e749836e7a5007fa74bd62ad11871d4f392096 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/1112] 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 651ff181be363fc44d498ede36321482c7178390 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/1112] 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 a6aaa29756a891e029428e19cc40e796b4a1a364 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/1112] 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 3c6784b40206f9af6f9d7661a1eacc8078dcd271 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/1112] 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 04a0680519f52172bdb83134b087e550e27fe5b7 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/1112] 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 e8862bc0c630e055221cbc41b19ec64b75df4f72 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/1112] 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 c9d4d49a2b0032e23592e7975705faae074e1dfc 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/1112] 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 cb62318b915ad69b6fc324e25c29a98114f54b4c 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/1112] 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 8920f267e6e34e13bbd45558e8f8c42c61b94ad4 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/1112] 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 871b02de6ffeded8bcb2f8f209e6080d8cd6d4d3 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/1112] 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 09c95301d4fc1ec4e1bea6a992d25e1724db5c65 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/1112] 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 710a4ed383d9f05d9b1e4279238e50914f37a2d4 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/1112] 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 845756942add434924c205c5cd9f22deb723cb36 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/1112] 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 74aa08c59fdfea4bf6d38773572a0eddd1dc52e3 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/1112] 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 c426393af781616f139f526c28d0e9c630e2046e 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/1112] 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 f440034c070e3da84386f1f77c4459e9a03436a8 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/1112] 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 35ba5c84c39a13139c76bd2f91b5d79b789b5643 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/1112] 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 3096d28bdcf0aef8ec2be479ff88f5d455f65c7d 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/1112] 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 d3ee57d9af55c01d4fc5325cf25028e236af1e4d 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/1112] 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 9dfd8c6a99d889c5a41d80532f9d2163fcd55c9e 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/1112] 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 79014d993938735b1db45c651010eff3655fcf64 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/1112] 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 8b8481609614d21d2fad6ea2dc19529e76e26e81 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/1112] 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 0de2295121bfd193a1165385d39d728c6dc614ee 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/1112] 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 d0eda23b67f6fa7cc246f86e0c5ef907b353a871 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/1112] 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 526b157cfa7b32d942b248db6fc1603524d12f45 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/1112] 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 548b8bc03e1cb31a5a55dee4611d2425bbf9c15f 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/1112] 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 272273ee2c63ad6798edbb96b49b74e613a682ee 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/1112] 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 85e7ae7d5e72a54dddd247f87250a41ec72a0b86 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/1112] 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 1eda6fd50549cda50d9b10010dc79d51984bc98a 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/1112] 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 bf1e89bc037e4af8385968975983fb5c79dd253c 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/1112] 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 f41225bfc27ab9063be4fe3e5d575ed6462b674f 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/1112] 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 c47103a96a345ac3f0735fda45b24ba48565b605 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/1112] 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 27dd166bae2b91c2a6d2bef98e1a52e945783f0b 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/1112] 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 f06833ab8c6743db970b4000531d1a431d2b7d30 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/1112] 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 f06a764a1ce4ae57dfba8067eb898911ef4e1545 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/1112] 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 0b43333f3b6da0ce69a11e1f9e5955f239c4b655 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/1112] 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 8c9e036b02501565b30c8b79c5ba9d1957293720 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/1112] 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 5edcdbf411382e2ded75424b7f324b3ec1c4a625 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/1112] 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 f94765ffd6277fc21cfc421ac39483d525358d09 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/1112] 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 e8a7784ca0ef24c6bf743410598fe2b2fcda3b0a 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/1112] 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 b5df114542d416bc83581d3285d95ad7de0c45eb 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/1112] 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 3bc30844ac77f9b0f48df7a2a77e5a9c3061a382 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/1112] 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 f86a71850cacadaddabcd9c5344894099d8c0008 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/1112] 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 2f017f91f6aca96e6269a24ee16f9472c861ce9c 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/1112] 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 31acad080b92f78f7b1e4360e6231f4d316afaa5 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/1112] 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 4f156b818749cffb450f1592662e356ef89ed94e 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/1112] 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 da39006196fd10d50f9455ef9f9f4ea94cfe1a8a 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/1112] 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 ef1d174e5022f5de20356a3609e1ee5203413023 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/1112] 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 e1cccaece696f4e9e9c5228d8d9ef083598c43bd 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/1112] 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 9a7999d091214e00c63ad1a8f918e1d68e038297 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/1112] 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 fb403c46a9325b444804ecc368d99236b9a43b7c 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/1112] 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 04e609490b08acf674405f4b4545a8e71dc0c06b 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/1112] 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 43e6f902165dd904d87c6ce3e441c017f5506cd2 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/1112] 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 38d0eefa93ec6e564ad059aefa24eb62b138e635 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/1112] 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 d21a4a868eda1bfe750fde8a37448def4e575ea1 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/1112] 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 13e42f311f07bffede31aa8558175e428d18cd6a 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/1112] 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 152f3c79858ee685f70ac1e5b24f4ccf232f8c2b 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/1112] 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 814d1c828efb4a07fb8c3be646dbc84dfef07954 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/1112] 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 c5d08c9c731d91e8e6485d86bb30c5ffeb77e172 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/1112] 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 a621430edc5db104e4e56f1f4e14e989a0cb3c13 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/1112] 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 36fb0797dbedad3aa70098cc7b84255cf75be8ff 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/1112] 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 980d573b1697b084322bd7026ff580f8030d4ece 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/1112] 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 26f6b35d78ecec847d909a79ae09c19b3b83d8d7 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/1112] 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 24e59d7e80a7cee57f5ed1af6e27f224a5acf1d3 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/1112] 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 59f3c6867755df239f3049664d1d0fb6bd13e171 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/1112] 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 50bd6e2c46a20155c0f177e8b81445119e146f2e 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/1112] 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 800e1eeca21acfbea5dea21d4de669ffaabb9227 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/1112] 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 d6947bfee600ab3d74fd750978a7c13c616c2ac1 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/1112] 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 56ea84768e8e898404483f4b99bc8dd7e8eb0955 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/1112] 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 6a03dda339a1c048434e20c3d1bdd2de3ecfd1ea 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/1112] 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 69c9e519d512cc805e05b241aa0581e80fce77cf 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/1112] 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 540b00fc343517746b4942d816528fa39c01c59c 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/1112] 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 d7dccb32b87a0c4fbeec8364fbedec26c054bb2b 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/1112] 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 519457eb924ac6d05602786d79295ec4e5d90b83 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/1112] 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 99902394c31164b3631a047795220c761215a08a 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/1112] 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 00bc3b6073e513343965680a361ce460953654eb 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/1112] 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 47c3a5f2864881802dd362a3fcc02b2d659ba737 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/1112] 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 50f3a0fc1f3804a2754458dbfd981f6822a74cb5 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/1112] 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 ed3e728b9ae0a2c0adb81e0ab40120a1a12bdac8 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/1112] 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 681c6f181af8f88bdc8ec838bdb705c5368e9534 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/1112] 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 fc4e8c794e359c9b559a2c68bd0156a67ac78e70 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/1112] 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 fc03b87447750f102796a860ddadc6bb5226649d 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/1112] 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 a0f3929af3f7b3a0808cd7c22208a1c919f3fb86 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/1112] 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 7ba337f900c2ac5830872a9c0240ccee11e993d6 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/1112] 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 ca6e4f17e4f2f97331098fbc458c6164fd4ab277 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/1112] 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 15c3324ea19730c0038bf89392949adf93b8cd25 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/1112] 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 ac62f5475d410836549eec8923036b1cc94e6612 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/1112] 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 ec8d4fbdef64bfa691aa90128e707a08ade703dd 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/1112] 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 ec6f200e6baac9e26ec979afb252f0cb479e770c 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/1112] 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 fee6a85bfe7aeae850372ea6842a4fe37ff0c8fd 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/1112] 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 5aa84afc9a0c92c12c4b8f160ba9193718c043b6 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/1112] 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 1945e72d82dcdebe1e7fe3432f038a9e8eed64ae 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/1112] 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 80ce81180261f30c6f02a0e45b100dee0c87af9a 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/1112] 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 2417ae2a0ab9c44a4efff03934f859b297c6f7f1 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/1112] 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 0c1bdb93304a2b84f098dfcc6427bc13120e3817 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/1112] 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 7ca70fda9d84e9a9d8ec814a7207efcf2fcfc41b 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/1112] 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 b369af7c74f9185159264ae240956a9b5e3eaed2 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/1112] 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 5506a8fd274baf0eedd41db798e6da5537140855 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/1112] 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 a8d34ab2ed0df1a9ad432d3c6c10c8e665fea685 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/1112] 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 50e1ba055eed83f8072c1aab79703479ce41caf4 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/1112] 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 69a3c7a90140a33f53d59ece13d1263945087d45 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/1112] 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 61c79585d5f1be64ec63fe2f4bf40bcd3af27b18 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/1112] 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 b1993ca551537dc610562ed1fe2ccc328c598294 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/1112] 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 8c22c32eacf4ec986588d3c8b8419c7e30179824 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/1112] 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 e7513b612c868d4676378ff8d3af78f23e2010f8 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/1112] 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 77455aa82fe3fbdea14a2588018c710ff6f0751e 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/1112] 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 6d0afdcbdc00a29f446853ade2867cea93a10dea 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/1112] 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 3100b93b2557fb1d72479539efead01eeaffadbe 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/1112] 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 a88bc38e08d71740c180b4341cc2633d42db681f 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/1112] 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 b1f37379b961a2cfa4383e96470c2268301f2191 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/1112] 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 56a77b2aa362d2a3a86b5ce063ae3833a74aa532 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/1112] 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 86db68b0b3c923bb9ef8b6f23f6708e8fa895993 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/1112] 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 c067516c4b889374f0cb4cc3b6aedd9dbe4a83cc 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/1112] 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 b2d6145f4c59025aab11ba66e84c49830ee39ae1 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/1112] 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 852d5f84dcf1d4d2f0775b162d6a5f86c69204ca 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/1112] 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 5f3211bb1ad7d126a467f6d5ce7bb9745cfea4cb 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/1112] 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 42cfccd7f78c752c8e4f80beac088b97e01c0a0f 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/1112] 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 3e0b75be586ab7a3db389c37c3480ca714e1d66e 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/1112] 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 3f62eb233f41d8141d8f0c7c82dd86ae4a03aa84 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/1112] 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 5d2bee6f5412232a236c623a272d690cd256ca87 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/1112] 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 54c449f54049459dc3d9d3a8e5bf5df1f2d8c09f 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/1112] 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 13116cb6780dde79391b2a1349e566998ede246d 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/1112] 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 6a070db3188a846d4cf0ed0590175543eff24bfe 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/1112] 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 f38ab0a952ac7202b1a5c0670af8c5cb93205a9b 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/1112] 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 cbf6418bfc6af535ae740d270b2e6a701049dcae 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/1112] 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 78ce3ff1b72ed5604a39a6c134f6c1b0dda6cf72 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/1112] 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 d8fdf7a3ad0c6b22ceb072e11474714ef1699bd0 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/1112] 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 2759ccaad6b453285fb6450ca342fc57db2b4fb4 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/1112] 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 37c4d498c754cfb4241f26a1f9c730797c02967e 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/1112] 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 711bf2da1310ca93379addc1043301dfafbc24ef 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/1112] 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 cb3817f60c53a4dae43736d14d9a52fab217c338 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/1112] 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 7959492180b763952307c378b3f9a5e01868345f 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/1112] 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 124a67bb3aac112e98919f9c6dc357bdae7d78c8 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/1112] 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 443d03005023e31689c29c34a320a596a752f775 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/1112] 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 df97510b41d7a223b77de51fd36630bb2ed14432 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/1112] 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 ee5bd0e48cdb65bb4474cbc4cd96b961ed34627f 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/1112] 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 0cd7017518f9ab3eb32d60ae3caa48cfac35ecfe 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/1112] 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 4243299f526b77456c63cf39112ae2df07b07d34 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/1112] 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 c76cfdd00c1502532d286a6055c1a1c1fc9bce80 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/1112] 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 411052e938db12d789fc9843ec733f0fe4b72033 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/1112] 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 1f8ab3f0ede1155523c48321c615c9da96743b20 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/1112] 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 cabbeed3ba2423bc6578435819263675b016b414 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/1112] 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 dbb0a815623039bbd0ef22b1e5e56b84fd7a3491 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/1112] 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 14dee76c436334e6e137dece536194b4bd5e7e96 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/1112] 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 f9cb147a02d7573276b630d1256a99227a1cb85f 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/1112] 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 307d389a5febcb4e5db5bff0b1f37668333e855f 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/1112] 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 1f1b39ed5733d154412aebbca2b6a2f59ad97835 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/1112] 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 61a7dd15cb16c1c40d331965c67a92773d62d09d 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/1112] 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 598c07787efb4aafa24efc403a68c61ebf942be1 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/1112] 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 1fe82e2118d7f0bf3e396817c7e36cef3adc67b5 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/1112] 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 3584137d0c6a8b46f5717d43706ed7126c61c6ab 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/1112] 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 a2482cb806b6c1c3f1dbc3c7993269e34277c72d 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/1112] 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 652dd05177f18239c7c0a4461051c02dcb5e9e4d 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/1112] 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 656dd4ec3cd3ff4a93a210a1b26117bb1329f78d 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/1112] 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 845e7470e22009f88a7f25d782e44cbdd94d6f63 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/1112] 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 6f25b7a93c699ada2928a34a85d8ab13b1ea3f3e 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/1112] 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 db7e979cebb5dfaec39f2da82c43becc846d4b60 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/1112] 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 d3bf97915c36c3d1663f87244d2574492343917f 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/1112] 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 ad4a184bad000cf2f5cddfc7d1991e0077117b6c 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/1112] 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 d495bc257366858fbfb056b4eb04038d0e0e43a9 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/1112] 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 8811fbe4cd7c1a91bb5d1fe545b99459ddf882cb 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/1112] 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 17c50f9eff87e2435e1ab5e835d2cf974579a5a8 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/1112] 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 65de4ee0227a6897f8ab7a8b72f3bc9e0756a01d 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/1112] 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 3bd12c2526bf79f8958f51d1760f48f00d4ade38 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/1112] 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 7a49fb77b1ad12f020d7d703fa462f34609d1809 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/1112] 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 f61651dace2c7b43ccc228800135468c5835975d 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/1112] 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 d330df7261a2dffce9b8cb70852f8e9b8d67e265 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/1112] 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 156f359e40fba34f693a117440f45c552ab2d0dc 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/1112] 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 31ab0e8ee61d546bb06234a8d1d08301ddd30c2a 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/1112] 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 72a53c09af033571642b7892e755f10950419287 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/1112] 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 53ee6addb7713a49987addfc99ab9fb03cb31e45 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/1112] 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 a2e3ef5d90677cd325e96aa0d37291713434a218 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/1112] 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 2cc3b61c7eba1a8c7845b5e6513afbda71a211c3 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/1112] 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 04c87562901ad0944021cf00252da0889fee216f 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/1112] 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 068c3a9b286057a3167fc7258898dcccc20081fa 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/1112] 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 2f8edd51f52c1043c1d2e04cc6fd0f20e5445dd1 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/1112] 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 77222105b87c6da3a9a6696076876db6b06c6dc8 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/1112] 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 669f27fd92a9397d61982b8ae7bbece969fb75bd 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/1112] 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 743d18c11b70c191feb6babe49e99b46127c3325 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/1112] 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 2ceb85687ab16bebcb962c206c72dc318de5f3fa 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/1112] 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 0e95cb6aa5970033b6b849c0a9217e0bf44e2367 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/1112] 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 81815692acbebba4dd2bdf8ff130b439a95d2e66 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/1112] 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 70398d9a204e717f802251f10aaf3081e41e0d06 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/1112] 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 8d5c77efff9fb1b1dd9acb6ba324b6d43841252f 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/1112] 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 c46a31352daa41daa266d0509fadcb8d417eaa3b 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/1112] 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 c4b701716cfe6ed29dfb922e07c286a8a30e469c 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/1112] 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 41991d23fdf4231861120b8bcf3b30b998936b32 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/1112] 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 e91c65b9b0e58cb0838a02e88b91522689b5ba81 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/1112] 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 39f5a662d484bedf238a8351fa6a7dae594ffe24 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/1112] 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 d82cca72963818688893c194829a48506b405ac8 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/1112] 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 bbc7f2029eaf24c7a89c9d31745997da80f449f8 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/1112] 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 a00789ff87debe1f69ef383d1e0089b775ec1102 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/1112] 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 d0dd4fcb340f496e0cc0a28ecbe66598a576df47 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/1112] 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 4654d6f3e99f87ea1b8ea474e691c4e6c6f458cf 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/1112] 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 a1d0e4783815960998b677beecaffb4ce7fc09ba 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/1112] 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 4c70f5139df4914b403cf4df8685e925a0a1a370 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/1112] 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 7cdac48205734d1ed744fb7b2c7a8071ffb0998d 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/1112] 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 2332bc44847af6184f3f3a65817fbbd9c933e55a 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/1112] 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 a9d5cc5569547d1684950f6a602519743473c2e3 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/1112] 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 a573aa726d118bbb1a60572d9107186549b5fda0 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/1112] 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 babb4717303223028abe6b5b058e74ef1db97567 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/1112] 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 598468a3ff50e6aff7f738859a55e97ac2acd2d2 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/1112] 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 4bfff59c37b307ef41a5abca37aa3dcf905d8a99 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/1112] 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 98ceda17847fa808b32c1e79fc98795bc7802741 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/1112] 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 8bc366736498941dbc66c2be3943ebdf9f51284b 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/1112] 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 94cb17a63218dca9f12e6f64f08a7041fa6ab172 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/1112] 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 726b6dde03a45dceacfe3e3d86f9564732f1fe67 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/1112] 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 dd783ef23d668998099e8062e3c1b59a176bbcff 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/1112] 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 c0f01a54f2751c7d41e798d8cf770ce6bccfd7ee 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/1112] 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 9ccad995a4b995096b36b63622bb0260815c5414 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/1112] 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 45902bf3c64f8edb0e9f01f5853e11f80e3bc3ab 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/1112] 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 73afe313206fe19d1b3eec6eea3e8882913377c2 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/1112] 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 7178c8ab82f6131bf22fd690be89ff47b2dbfbdd 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/1112] 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 74c142cc1828dfbc7b95da9f72103ef6d6f872a3 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/1112] 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 b5f40f559f0a5ffdbaa5c790280ba6837409e0ca 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/1112] 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 d9915596788246696c41e14b0eaed6f1684af406 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/1112] 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 30cde13a81d39e4a97375b4b8f5600b1c51a86d7 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/1112] 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 7cfc100ea9fcf5b9747e1889ce097bde4e2041c3 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/1112] 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 6b1e33bd6c3ffef630ee2717222551ad489552a7 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/1112] 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 18438c519766d6b8c9d53cd13c193f629e6a27c6 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/1112] 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 bd8ce391109639e77e2fc81fe44c0924840614a6 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/1112] 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 3b11dd38dae250289f1b07aafae7fa977f7ad852 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/1112] 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 6ddea8fa998a79204934fc41414f7a1599ccdaba 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/1112] 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 5a40948c3162a484c6662fecd77e8355e652dac4 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/1112] 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 912bca6316a43e6276a60040894fead49bf7ea62 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/1112] 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 8f93f4e4c6a631cd0fdbd931d1c19b7c982bd20d 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/1112] 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 9791413fc21e905bd4905d85cb4bab6e8fc4e3a1 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/1112] 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 706c79498503298d3820693f1d8ef36f9450c209 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/1112] 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 a6a2796b88d4d88b9b51e838a30228c9ef99b386 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/1112] 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 3ee011a2d721bf65228c4e2dcbab317c29ce04ec 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/1112] 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 43cace4c5657eac4e571336b40a43894fa135e93 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/1112] 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 ea93dea132f0e0d89e192fdbc8d7c3dccd841c09 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/1112] 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 8507b37c49a96f32f657520650ea1d6c26d0da6b 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/1112] 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 eac4cf9a5cc4a29cfa51e41a516d8238aec32136 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/1112] 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 11d82e612f05d2238098083cb2654868d4c03792 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/1112] boost: rebuild for Python 3.9

---
 common/shlibs          | 2 +-
 srcpkgs/boost/template | 2 +-
 2 files changed, 2 insertions(+), 2 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..41fadfa1282 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"

From c726e47cafb78091c3da512da8012c66c84eaad7 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/1112] 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 7d1fef4faa690565c606c492bb0bfaaca5b541fa 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/1112] 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 fcb99d0d8fb98181103c9cb7b5accd3279bd3581 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/1112] frr: rebuild for Python 3.9

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

diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index 49a03c73a2b..8ee465d1b51 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

From d81c15f51cb4884c33b8855b0ce525b6ca832c38 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/1112] 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 60e88d681ffe3355dbd85814866c1e5ae8641065 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/1112] 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 5c41dc7489df019bbbbbf4574634268b4a93309d 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/1112] 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 5801d3f2ec64b9fa0e47d8248a6dce1a1307619b 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/1112] 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 3b92fb3febd9f8f703aca049bbb6241f623915b3 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/1112] 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 9c9cb166bf528ef274da757a58ab333de44d6c77 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/1112] 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 585fdb3c295c3112598458df24eb665c0c1490e3 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/1112] 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 32e9247d9f0d6c1a27024150eaa32eda7e3d1bc6 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/1112] 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 fbcd72ca5d6df63374b50e6b67e6394110ac3756 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/1112] glade: 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 a9c33f54caf0a7b3cf9566d6a74faf774e45c0c7 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/1112] 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 2d73d07d2c45306434a42240585639ae46e07299 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/1112] 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 fb23a5a1e9ef79413d1df3c4e33f3b4f0ce03451 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/1112] 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 3eb5c0d02f25614762bf7ff18c0c251312f06d13 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/1112] 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 1135376e06d6fbb04d6f066080d3b19e80cecf8a 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/1112] 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 b10043f56d0b335700c289cfab7fb7fea3122a0d 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/1112] 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 9adf54a2cdcec058b51cc113ecb87ce0a8db6295 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/1112] 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 b0c4954198d7142ff0d46143a54ea685f1de1848 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/1112] 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 f88ade356c73f12e863a2fa650f9fa324049c680 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/1112] 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 5faea44b26067ee95b494abf7bf662045bad1e54 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/1112] 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 47d9f71a45e2ea8094cf4d2c23088a1cf73beed8 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/1112] 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 3e48c48a454796aaf5963860c1eaa891d13443e5 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/1112] 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 8f79a4509485315aa6d5a43abfbe699df1187fe1 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/1112] 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 8271b11119648c35d2805628152b7b76663a7ed0 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/1112] 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 d7be659be62a1a4000773d7370e3fb81cc08941c 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/1112] 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 b191811436a9b295b96da6eee44bc5ac061a66da 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/1112] 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 ea711c329162f5314ed42144e4767f7464be5830 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/1112] 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 81ce082083cbb70d537e3369a3cb426e299f675f 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/1112] 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 bda065caa6da8c034bf02f1e6d8c661d76450a39 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/1112] 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 e54c96ca4afbb137618f5cff8fd22c98ab45ed58 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/1112] 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 1b7a4f74dd3b8b2bc9ad7c7e6b37865787f68c0f 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/1112] 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 2e4692fbabdf7ae9fd0dd0405ad1d9a0bc805f26 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/1112] 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 d7db5e1ada2e2e6189f54362f47178ede3bf76e8 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/1112] 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 c326177191bff3e9699f27316e5339f562581698 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/1112] 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 cd5339e1789b490127e865499d849b423689052d 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/1112] 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 caef0d561e63f8b501a15869c902aa8edfc5bfb0 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/1112] 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 4700565e8688b49f7d4ca9bf72f24bbec828061b 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/1112] 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 b8027d773b6a82286653d395de0588cf3953623a 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/1112] 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 1b498f8243377e8ecfb76c3aa93cc3b2003b372e 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/1112] 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 fa345bfd206bea2d1856d3d0da372f5d92235b3a 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/1112] 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 dcee7fea5b965275c5d595e9897b55a317e821e5 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/1112] 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 0bd9651cdfc2e68f4b0a372f87f2ec63a87ca77c 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/1112] 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 1d7e0698ea639aabfa1b2819ad93685dac53804c 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/1112] 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 e9cb673c0851625efafdf0983b39f26b86570668 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/1112] 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 c01a102d2b7a6b17efaf8767d416cd03a66a2ad3 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/1112] 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 bcf28290a8a40568c8d2c3309c7505aceee8db94 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/1112] 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 d990877b0a25bac77083a41dfd5435b9ca72e618 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/1112] 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 4921a52c2ba6d2b3767a21a87d9922e610b2f133 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/1112] 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 b1e63a3427d186cc6b815873204b90886db98274 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/1112] 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 1c0bb92c5506b9ca241e2eb6f55f386d70ab507e 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/1112] 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 51a6d9099b33c196c29adb92f4fde753995755b1 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/1112] 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 c4a56fb6794c83b50446d54ab639f7d181663e3a 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/1112] 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 1fe293feb8733e9bdb290df2e6b390b9226e0b99 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/1112] 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 29510fe00c1dc02bd6eaa339fb399bcb7dbe98f3 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/1112] 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 c8b3a6d364219c799f4b0f1998766ffd494beecb 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/1112] 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 230b2f34af970ea7dd112e9820ee077b62114b24 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/1112] 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 296d127b1df2a3b7f57bb5bbe9dd212f31712f9e 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/1112] 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 507f6baeb1f2f7887deac81b7cbefbaec4343a59 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/1112] 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 c75e2588617fe1cb79b3a011b4b5d3cb10f52937 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/1112] 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 33431bc73525bc345045c291fde63d3c62e255ac 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/1112] 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 0ba288cc5e1f4c5d71bbf0f51e622dcc6d23527d 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/1112] 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 ead85de41c9e05a85957c87b79ccb936b3fbfa06 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/1112] 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 db4135bfdd34c0bed309141fd5c4700881b49ca2 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/1112] 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 2c10cec6c6366f10c239a9818ab78088499f1dcd 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/1112] 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 785d4478f92131cae292272a64f2a1a7623c424e 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/1112] 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 47b5e14244221c5204b563c4ef38ddc97bdbd310 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/1112] 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 d1e2317d2156eaaaa71164d26f23f44cb6d8f2a2 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/1112] luxrays: rebuild for Python 3.9

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

diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
index c750c684100..10dcbcc85f8 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"

From 835acb2a25902ae932b872851c61016636f383ef 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/1112] 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 fd6f9a5805d887123469614ffe318e59cb2fe69d 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/1112] 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 4f87f7f6d73a478c906df241b2e4105e69553879 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/1112] 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 6f3f3b8d293b2dff41ce6a7aafadf6e626c47f0e 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/1112] 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 e9f232bfe118f61d2b60b21f07cff2c0889697cb 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/1112] 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 2674ae87eb1d6ab5c7eab8bda62f98e326eee023 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/1112] 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 3f758e8dc621f509a00df6609419d8c3795f5b91 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/1112] 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 b00780b79738e2ded4013f7ebafeb64df26ec7d7 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/1112] 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 46a1d853db6f82d81f8effb608ced657321e8f94 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/1112] 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 07adadb3557e601fa32e497e3470bd07fe79c501 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/1112] 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 55ea57201bd68818091d5e07ad1dc84abfdfb97f 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/1112] 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 043e603167081f2bd1463825f0afc23bc1a29f8b 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/1112] 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 2d7f1274bee7feabe8623ee99ec599719a793b83 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/1112] 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 5c374a257718b2ebae53c953b0e5a312923e9c72 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/1112] 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 5c2285765634383da4b86b5103f225c17d163bff 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/1112] 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 62e0d827cfc027e9676f4553e246fe9df06a9871 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/1112] 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 18f454ab1bd9ce27dcdab3e122c014ca7a303bd8 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/1112] 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 304f291ac0def3d60fc3e36abf11ede436d4cba1 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/1112] 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 242c3805409e8984376853d977b969fe3f255af7 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/1112] 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 7e0058ff6285ff96985f9d97e9d00220d8b79d47 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/1112] 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 db704b60327a0edf7880fa4b144cd260f51d168b 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/1112] 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 2c3bdfcaa1cfb283a91efca12bccdbfb8ca599be 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/1112] 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 35b0eeac349b26d531c2a8efcb1663c613df9839 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/1112] 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 1199e24e1202bb7827c18ffc79c7e6ea22422543 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/1112] 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 fa27f67e7878caba5784334224704931bad33b4a 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/1112] paraview: rebuild for Python 3.9

---
 srcpkgs/paraview/patches/cmake-py39.patch | 11 +++++++++++
 srcpkgs/paraview/template                 |  4 ++--
 2 files changed, 13 insertions(+), 2 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..da841114a39 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

From ff5f07728d03ad9f4833fce4324762011a319016 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/1112] 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 0f13142abedf7cebdbfba5d31d28c82ea22ac6c0 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/1112] 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 951b769cb94d53d34e5d5cc131dc34751094fada 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/1112] 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 df31dd6fb9b299cb14447ea20aeddbdf5744375b 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/1112] 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 8126a99b157f54447d5e48f52133e7a1444ff8dc 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/1112] 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 86fffdcac83a4478d410840e596a25187b3e1eb8 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/1112] 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 e98d07a10ab97eca99dedbad4cbfd0590607555a 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/1112] 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 e61a71e31349d4e2d3c78a070b0fb45bb4361d02 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/1112] 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 f07c3bfe094100a7d460c5fc6b028980423bc6ed 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/1112] 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 0861a52418f1789d407cb6f98c521ee357ace7cf 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/1112] 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 cd9fa090057fbb0bd4d126f9e3744130216e0022 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/1112] 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 5b0964f27b6aa06dccca395079f0df9dbe02786c 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/1112] 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 a8d60bc7aa7333a149681dc779ae9c1d882c51fb 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/1112] 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 5f347dae795e953eed64d9937b7b1d9f253c4c78 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/1112] 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 89cb82d46a3c174a79494d9b8ffca39e04e507e6 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/1112] 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 80542ff9a7cb3e0c40886f257f6928760ef9f13d 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/1112] 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 f3c1c51a87083ec3eef91d1998c51981d783fb53 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/1112] 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 8984c1aa39dc0403c9adf995ec482248677f97e8 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/1112] 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 1fce418bac52b091775fd86e5f1baa44a3a00a00 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/1112] 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 2f34d3a70e68f7da9c32a206dadeb03f427db1b6 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/1112] 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 a093c847aa571c71b7cc5fbccf3e1a52ec98583b 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/1112] 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 a2037d560e8127ae2518901401d5c397ecfe53a5 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/1112] 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 41ad7087cada3e01865846f05f84cd717527e86f 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/1112] 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 5f89e922af0ec1670a5d0f9bded3261e56988953 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/1112] 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 d7f0a11c0d1476a5f027f505e1f11e199620b8bc 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/1112] 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 4e9351f544386024b0aeb8c3ee5e5ac873fb772c 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/1112] 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 c37c1c52199694711e156e66a3b6a12994ad6f37 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/1112] 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 d393656b105ab06bdf1aa5c6df5091ee8aee8057 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/1112] 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 c11cb6d8fbae4d57e050e5caf4fae45c8a662f98 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/1112] 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 d78288a250449646a34e8bfdca6355d1d2ec178e 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/1112] 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 2bc42f86518a7c9666c9a54ba36b6cd28e687950 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/1112] 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 86f7f902a9eaa88d3dd37f06a3b55d6ea19a9769 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/1112] 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 22e1cab8187c4283af0ee68b09674e8c3271070f 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/1112] 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 445e6f8be136bd9121ac804ce8ccedd194ddaa63 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/1112] 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 c42d7d8a895f9710656423a10450430722b7d107 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/1112] 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 ea381a8822d24d0a762fa3e83b45b1a9c1b6e837 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/1112] 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 f92f6dd5e9a8e671e51688e8585cf54cc7971ca8 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/1112] 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 d07ce961d087093ce4c07228e3f84ac44b59a20c 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/1112] 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 b105f458209fe9d1bc41bf0092009fadc260b912 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/1112] 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 b3271183e25bfd1d67a04537821ee806998af86e 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/1112] 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 ccc5d4ccca9d34464d5dca23ce793964bfce3150 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/1112] 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 1d8b6d79a141ba98fb289322422c60bedbb810d3 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/1112] 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 8cd956c3550a93685870f097bd1f6abc2ab139c2 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/1112] 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 97581a5602888b36a238b41bfa85f9793374d8ac 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/1112] 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 9a6965ba9e6f4410fe275f6551b1f7ac964e9a5b 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/1112] 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 9fb4b8db71ee04bc05570f0afca2839d33f14e94 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/1112] 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 1cef76f90d74f91e60646727ee691740ccb88670 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/1112] 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 1789d5750f7c62ed44ca5e8c40435b4de376bf00 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/1112] 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 596589c8bbf6a7c0b6410d166351324320ed1d25 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/1112] 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 ac5c5e5974c1cbdc3f9f1dd505dd64e58cfc1f4b 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/1112] 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 137fdf851e66cfe62268e3cef23614248f3bf46a 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/1112] 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 ed7aee68bc9803ba3e6d71fc7a9b56aef1c84228 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/1112] 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 8d0b718a0b1b7d40677b247225e3cf116582528c 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/1112] 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 e789c45fc90abf7bc5d3aae8d94e492e14c31a59 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/1112] 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 bd51e6eb492586cb56c33363d9012e1688235999 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/1112] 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 3ced787b96c26c9bbab39352639a3e0ac09be932 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/1112] 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 dc6d11d881e7c2868cf9a3d3da63c405854fec92 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/1112] 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 76b2f97ed40440fa2629cbd4faa5135dc16f2b50 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/1112] 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 f1c8c4c04e5f06676b0641e5d8d323299f57f601 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/1112] 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 b5a3d01bad0ba3f7497334254724bb672aaa2a08 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/1112] 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 66e83b5cd1ebe447e94ac9f0d83c0ef0621dc8f2 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/1112] 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 32cf2625c533979bd68eb353137fcffbead6b105 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/1112] 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 d59e5a798a0e5e27f5197e1f5313bca08c62c8e7 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/1112] 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 fc3f2f4ce130c9558a6e2a0f0e22e81cf26a628c 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/1112] 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 811946bc8a618ad9d20df104b61eee6264ee7ff9 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/1112] 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 9a09644d17fd3fb418dd24330000235c5194ba01 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/1112] 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 9523bd19ad93df5752bf85e98c664635c6fdb155 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/1112] 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 3871b0422d9778da829eef49aeb547a57c459d20 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/1112] 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 a14b1019819b2986555574bfeb2add830d378c71 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/1112] 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 63a99bfb03283bbfedfb3f42b1cbb116961877f5 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/1112] 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 0dd577a65237a9a058a1f6e794b2649d69456c51 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/1112] 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 acea322348ce875004a8023c38a1631cd139b967 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/1112] 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 597cefd787be36bdf6f2d1b3234f758bb57f9096 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/1112] 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 02d513cdeceb97a900bd0b2473884de60895c412 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/1112] 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 0fe2052289d6243f4529e309d1843cf1a6285573 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/1112] 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 0eaa46314553b13099776128a2409afbaee356df 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/1112] 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 d93de57120eaa019709b7049061625f4759ee6a8 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/1112] 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 dabc2e9e1687c930e6b4d490293b4ccdbff45a12 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/1112] 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 fb9f512bb1655a693cfa2de87a5d58819ad1e0d6 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/1112] 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 d026503a9aa65ba2f9ee0ced9fefcaf78e13b4d4 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/1112] 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 2ba43d6d04e7f37f0acce0c1a6cfb3615f072e5f 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/1112] 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 342905c27e36812f3bf3389fdc63d65e3d11bf25 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/1112] 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 5594558457c1f8a946b083d667d7439db08905bc 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/1112] 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 55eb42eafe13d9fce426b10047a1ea3733bbdf0c 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/1112] 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 eb3dca14b43be9833e2c250530b1c9cd4faabdd2 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/1112] 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 8d09a8f24070594f41051312f0e4d026cf8f2731 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/1112] 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 52066796054a69f22c47ef4158662bf46c244e7b 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/1112] 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 88d3853186e023f2fbe85e7f8201719ab9b2f7a6 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/1112] 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 cbd8a3143b4716af2359be8efe178dd9381280dd 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/1112] 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 d3a2426934089023e3a0762cfc977113648014c6 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/1112] 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 4e9b21374595642c41e47291534a1c50f2b3ddd1 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/1112] 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 b0685bc2f258f8a58b1abefe40eb3242b7f5a437 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/1112] 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 998bcdb93549d104beb5935da2dbad63bee61f2e 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/1112] 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 f59fd7da46833f18ad4270061cfbfe4b7bc177f0 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/1112] 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 0fa7c4dc50037d71301c047d04213996123334a1 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/1112] 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 39bc76a706388f9babf02b0d0910a4bc8b2c86a8 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/1112] 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 0f0dbb3ea9878fb6b06a4006b41c5469ba52a300 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/1112] 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 6cbf5102c7b117efda239b59394c4adbd91e3fc6 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/1112] 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 14e976a2676eaa46afa77b95f07bbc26d2541ae6 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/1112] 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 cb2e131e5ee8da45e74b5b893b6c2c32b862ce21 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/1112] 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 c4cbc4a19e308dbfe9f6b3a37b9f84cf764cb050 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/1112] 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 3435eb40fae5813537db0f2e2558a8d5de45539a 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/1112] 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 8215c46093d924ea7ebdf9cc8298d26a9a2ef8a8 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/1112] 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 2831d2f79cff433232b370c2a0f44c89a8319895 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/1112] 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 8f463be4c75dad01108e3b0de31588839f748e23 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/1112] 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 2a1a8d7fb96906147f8a5e6b3404a19f3cc18ce4 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/1112] 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 9e56803e14b874cad9ad1db3e3381db780010bd1 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/1112] 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 21719fdfa901b9657b085f8d4d100aec4c1c3e14 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/1112] 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 039ecc3235614a934c3bef8e4f303a8966eea02d 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/1112] 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 2dc0cfe4a9cc2b2ed7bd0b48df5ea7840c0cd99b 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/1112] 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 2bf31e823e1b0bbe236d2f953fec417040f7893c 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/1112] 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 2652104d16812158c80feb9aa6c76eeec9171bc3 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/1112] 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 6b4200fb3c6953838e0f461b6b59bc8b197b5368 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/1112] 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 e01f527a7230c15e81dc52072208247c18fc29df 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/1112] 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 6f907aa3beb6925cbe48e1f85843b8097447e203 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/1112] 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 47d38f38e65492c367f811d35efb93bab112f26a 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/1112] 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 d4d5b02ede4816166699b1d50b45f7484418e399 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/1112] 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 c347ee84c5f72997b81b8bda62a1af9d4e7e01c4 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/1112] 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 df83af64b01a45dd7e563bac423f34d152f6d13d 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/1112] 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 dda86eb25842448419df1e80052eca5f3b8060ad 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/1112] 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 95ae99349390f51cc3105599f0a383e752333945 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/1112] 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 b1249afaeae0bc624a5cbb322dba60f67933ea41 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/1112] 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 9db33728b81a912776af172be47b0e30dcb28192 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/1112] 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 58b83b34c50235985698d6441c9e7c14ed5930a0 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/1112] 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 6ac2f14241afab157af0943d8f6ec40a0af2a128 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/1112] 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 d90c47f7d8d159032b4b6bb8607f239d7d19ff03 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/1112] 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 cc80e81656a93a39746a9b04f77e8a85d1adc516 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/1112] 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 4942205c9f8f8ef2e37d186804b70a61a8478a88 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/1112] 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 7481784eb5e324f7530e3b33c87d70ae8a4f4696 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/1112] 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 130d00ccca8d352a7c94cb691cbd68e2f0550f92 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/1112] 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 e26d4848055923f8eb6b99f1a7a0f9f23a8e2ded 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/1112] 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 3a9efedd2e6df30e366e48f57b9967dab7632f64 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/1112] 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 38e3020bd14b178e1de97deb43fc4595d84ec99d 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/1112] 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 284e4dd8856eb4235b5bbbe0057926c0eca8df2f 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/1112] 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 028782e3d5aa6ae3108169f4e5e2feda093e273c 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/1112] 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 8ea59815590c35274fac7256b3284ea335f549a1 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/1112] 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 3f2bae12ac27c02cc3beb7403a641206dbc818a0 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/1112] 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 7bc615cc787a56e11a59b989d364bec2b4dc7f43 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/1112] 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 c6f2a371d9ebbf36021f4395b3d5f637c22bc466 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/1112] 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 64d5750d6ba9ad40ecac0d3b8c73304dec63ec1f 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/1112] 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 894baf72c7b845cadb376203e87e75e2ef7b215e 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/1112] 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 5ce4477870226681ae6e922084d6895d24a9bab8 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/1112] 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 f641795c7c51da6fa236fdcffbbce7aa51987161 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/1112] 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 fdfd00b0df4633037012ad4f88c2faa6ddbf4aa4 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/1112] 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 9d45aed6b27174e084d2bd980a36843b9adea57f 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/1112] 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 9cfdcb0eb783bd4e34c9c963c4b9fa98e0aebd6d 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/1112] 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 d1c123414a6488b806e6e1ea7b91462fe8b114a2 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/1112] 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 219fd78c8cc340a31bb06b609f724fc53f4cadac 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/1112] 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 8d040d9bc291f40ff63c8aa3f08438622bd00296 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/1112] 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 b5bf4c3a6542ad52e8e45dfe2d0786327c40d112 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/1112] 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 6a0366fe2207be089d3d7ca5c40a250438a5ef49 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/1112] 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 3ce87ce9733c2af94a912a09b2243b7a52e151d4 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/1112] 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 6bbb49606b20e2bf90340bc84b24bc153e0e766f 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/1112] 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 f5b2449003c440bb2ed9e105df998b51da987ce6 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/1112] 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 562e8c6cb125ff4c8e92d856ba1b8148e7ca3676 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/1112] 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 897bcd2197f15bf31f531c589d99095e31a6799b 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/1112] 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 b9a878b3b6a80cd2a8245755a71a0121b8492308 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/1112] 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 17cb033d9f7be716b666e51cb7d5a7064e057606 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/1112] 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 369d7f13f58af80f5412880386820769f993c102 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/1112] 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 b4f30e20105f605c45764ea9ab883c433528e0a7 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/1112] 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 35994e9a58e0ed0c895fbac722312a9e6846965f 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/1112] 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 9c6ac868daf984fa6ccf0df65e833042d81588e2 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/1112] 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 dcc906a5276dd357d0e9f63b0e4d1b5e5e5da671 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/1112] 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 cc3f925da0d6dbe8a6975ed83cdea64c8482139a 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/1112] 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 fce3a0faae723e41a1eb11156029920b3e919af1 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/1112] 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 edd81d54c1d612a35f39cb66eb5a59fb1d4d28c7 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/1112] 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 4e0b59c90e047114f372b8176fe2be4b11f4bcec 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/1112] 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 7d61f6c540af540f35b91637ff7b2c304dc4c3e3 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/1112] 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 1c1e8eb46811c008b4e46737f9c756ab2ffa915a 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/1112] 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 e75463cf96138408f84e1aa5f482655e75d668c0 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/1112] 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 39ffe47012d9e9df4997b6c511ddffcfc15aa3b6 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/1112] 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 a3c30e1ba6b1386e8f0575bdd5adafecb4eb8ccb 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/1112] 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 e79aed093f66567b124e4b5d4f72f21e14ea6330 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/1112] 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 a8d9bbfd2639db138d53ae5dd6548bcf56befe39 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/1112] 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 12c16dd2e1fccf474e27f6ae6d388f8b02fe7d53 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/1112] 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 d81231b713ecc4b240ef709f7b6025c5e4685d00 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/1112] 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 528776af2afbeb1aaec9cfcc20927c3b198ca5c5 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/1112] 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 4d22585976f1d11b746c999641f8ec4d5d7da20c 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/1112] 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 90f2a33c498c8fecb2feffc0a2c6fe87ecb50355 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/1112] 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 beec46c95eae569258dd8c09c4ef8cfd2ded9284 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/1112] 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 bdef0cf204438a78f48cddf1e6a2cc0011013636 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/1112] 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 baae2089d9483d95a285f7ba0ccb540c39af135e 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/1112] 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 292298c6bd8ad9d48bd97f1f06c4dee3d318b8af 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/1112] 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 9f0d315bffa13faf39abcb4d21462c37e63f23f2 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/1112] 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 c9de867b627e7821ede8fad43ac90f6f00c05578 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/1112] 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 95458ebe55ae60c2cd69c5942c56572a2d697851 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/1112] 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 fa4441c72d2fae7bf1d89840f2135f29d6d3bf28 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/1112] 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 29ce2cd4d23cd529e3761a284663b69dcfdf4e13 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/1112] 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 f0ecdca831ca8d08235f7bba53aa8c30d2a88f39 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/1112] 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 71d2a79e658d57d1dca69ff94bfe040bb79fcd67 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/1112] 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 a7ec538686b46ffa2bb461c135702f1e44295275 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/1112] 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 fc649ed88808367d9a4804686dc1ed5ffec48132 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/1112] 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 1a6a3fa5b7a2183bd47e18ec249707b63cdfae45 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/1112] 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 376c09702119afb3c672b1d05faf5929eafc5fb1 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/1112] 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 d41c995704c0273c1745eaef3c6a774e821aedcf 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/1112] 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 c1cfedd97c6f6d040b0319df3e4e611629685b4d 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/1112] 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 5e6e18f4d7a6e20a07a64d8583f8cba221491bdd 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/1112] 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 898b62c227a7dcbf10647058e71c75faaac5a8f2 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/1112] 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 bae4634b02dde41ad81360704347c8220d00527a 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/1112] 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 72d9c7afc49d9ca2943232033566dfa8e1daa4a0 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/1112] 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 0c3bdf35f943cda5205589866f3b8f231181f1b8 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/1112] 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 15f0a07262266ef7d246fa333efca5f84bc5e35e 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/1112] 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 5eb1d0a4ce071ef0929e1188395382eae27eccfd 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/1112] 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 3436d4a7a5c6dbb35f5ecdb8eb40e77a9c6ca89a 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/1112] 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 4eb68ebd3a7f4c5a09e68afb367d4a7e5ddae896 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/1112] 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 683ed25fe902816bed7b469f2d3d8cb5de766e67 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/1112] 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 0288b529d031665001489a7946088587f76f4c1e 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/1112] 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 18fd76f367b944252370168985a0c1e5ac8feec6 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/1112] 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 207765601265808993f70ab5aa2071d3a9337ae1 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/1112] 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 a7cfe1542bb24f5fd4ac86de945b6ed22e3e00a6 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/1112] 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 3261935c046e1d39531b4435519473b0a9a3b32d 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/1112] 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 5449f04ea641ae64791eab074721edbb9f772765 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/1112] 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 d0a2e96488e38384c8b9d8ada3959a000233e81d 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/1112] 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 66a545e553004f05f98ddfccdde59c797f2bd5dc 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/1112] 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 c7c5133b2fa21c21f2a7f02ba59b5aa62828ab78 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/1112] 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 930380adf46ab1d59727c5c2510a8fe30e883312 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/1112] 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 d18f8ab590bc1b50b74119f2e11a9c09ae03aac1 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/1112] 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 e24bbd9bab61139a96821fae87b87523d1ee9691 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/1112] 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 99f3c047d9312f1320d7e7f3547db334b7933c1b 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/1112] 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 a0a7487e9c7aa3c5dcb816e08df079b905f141be 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/1112] 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 47e0073bbef98c604015c3c525a35a562458ce75 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/1112] 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 0956a3ec7c0d9d30a2b5e4375fb1e5c57fdd9165 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/1112] 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 c0c2aa91122aef3bb3ef278891761e221d4fccdb 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/1112] 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 b9bac021b58833a57d711b20411851c0899f6477 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/1112] 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 f0c0c177e27673ae9f7b492e73bbd6d1fa7eeba3 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/1112] 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 0b271379b1633683cdc5b49991186345eb6b71db 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/1112] 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 10097decba5515622663ef371052fc5ef939df40 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/1112] 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 1cb5b99bf3d8e58e6f072aad65e554a21640dc6d 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/1112] 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 a8941cb7815565a8580986ae29380012ee5f5a04 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/1112] 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 8c17c5c18a583d45633b87df4fb7de68e849071e 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/1112] 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 4670e55ea9d56bf59904b9e9be9e5217e4fbca3b 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/1112] 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 a457e6988cec6bc8c0ecd601e61186a26ab92ff5 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/1112] 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 bdf5b72bd6aa085d3113c7c5001a94882f26ca29 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/1112] 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 13118e3266fc15b7f1e0e783baf01601474bfeb4 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/1112] 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 ceec5e15c62dc987f84a5bb5d6c89b7a5d6582f0 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/1112] 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 786b6ab2fefbe48dd96be744d8ac31b3adb549d7 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/1112] 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 41fb35f0efe00e7b8fb057e72908d1425149f89e 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/1112] 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 2260e4f8ecb750a2d243d37e381dcf32fa5222e6 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/1112] 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 953c30b2811e013bf22f67bc8b90c2f5be86d98e 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/1112] 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 f54ea2490cff2c0f509d52c77692a8412def6d09 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/1112] 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 a27f4d20be9fd35ad6774ce19e8c5094d3b456f7 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/1112] 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 e019382b9c39b50f89b83e915aef01bfda63b831 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/1112] 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 109948b1bb62188c63c22399e97e5bf2b6e907ff 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/1112] 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 50b7cce3c0a64acf6c01e1949af6877cddfb1c2c 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/1112] 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 538b07a7e1f24e409f4a8d7ea8bdd27ea52be0ce 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/1112] python3-hypercorn: rebuild for Python 3.9

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

diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template
index c61231d1163..2434f688482 100644
--- a/srcpkgs/python3-hypercorn/template
+++ b/srcpkgs/python3-hypercorn/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hypercorn'
 pkgname=python3-hypercorn
 version=0.11.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From b0d77df4bff934721ddfbefd5554ac138649faa4 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/1112] 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 4a3c08e98edd1e12646918ec6fe1ee8439066fd3 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/1112] 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 47ab15225ead80822b40059089c28ab1cfbf5809 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/1112] 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 a30d07c40c644d111ef562b32f6f18443a2d4044 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/1112] 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 2624c4b5445464b0a258c1077d6ba0b111360066 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/1112] 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 eb31060d6a4633a0b4b0bb84f7e12715027b5509 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/1112] 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 650b8b8102bc74ee6188022f01b6cffefffd8344 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/1112] 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 ad0c612f03a8a1beda161b86cb1a4805b72249c6 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/1112] 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 365aaee805995f81d3fa3b04b46dd0778ff3bc9d 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/1112] 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 9addbba1480ee30e547bf731a441143f66549643 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/1112] 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 4fde1f7d5435f199021cfcabe121ed973d7a14d4 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/1112] 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 21408e2dd26aea1028b4efdd6017df983d349026 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/1112] 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 7fd31bf12927a63cb2e16d98de14bc38fe4ccc8a 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/1112] 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 bf2ef615211fbb2898e746e5c14d020be220012a 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/1112] 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 81338c77630777d710de4a0740ddbbdb5a5ac099 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/1112] 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 48f13036ac1d108b05f43b75a39b53e5fe0c47f0 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/1112] 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 4351e2dfe28c99519ac22f403f69047d0b3a306f 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/1112] 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 0fff55bf2de742692c4d099af376148ba678906a 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/1112] 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 10733f82d826c6bf0b3ebc5f2a3f19b216dc9e77 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/1112] 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 e578ce0bc200b292fadfb41d5c27a032351ec94a 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/1112] 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 4501383a8c60a1465c306c3f44796ef0611d9baf 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/1112] 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 b22f083e2a7d82ed9d6c675cdb2712f0f5964255 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/1112] 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 fea87f4a6e9d9f68eeb78324b5aa2509670b6d82 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/1112] 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 bd8c56fff38bf5d52bd47a730a4ee26f2758f3f5 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/1112] 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 4527239fe4f90ae41ca11464a5fc082f3ae3a08d 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/1112] 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 0513bc24edc9d8835b29be910d8a56bccdf187d8 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/1112] 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 90100f2290edd6a98267bdcbb4e951d85afe2904 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/1112] 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 3fb56f0b9e5930840e5be93d6422181730d174e8 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/1112] 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 2b4d05f97c0572019a5b1ac060af096dbeac76ba 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/1112] 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 be9cbea6fc82b2fe0a00b6e549d975132068c0f5 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/1112] 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 98f2c2729d52a13b4bea42aba9a5ce91fe2af84d 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/1112] 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 cdc3b69e0bfb7f6d489df512930229acd18aeb0d 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/1112] 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 4649a0f631b361313ec45c791652cee7ee0543ae 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/1112] 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 24b5f4c78b4788308407da0861acc682e24ae347 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/1112] 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 4fe49706b05a21c9a74541604d65e4834c7654ea 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/1112] 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 1d014771d5baf8e2ed1729d340c0b8973597c51d 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/1112] 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 bc515958aedfe4b2c28ae4e1bea26fab7ab26414 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/1112] 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 9eba353dd01c9a60ef9223f954c4c7ddcd8353cf 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/1112] 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 990cf42bbfa8a35e9bf7ef939e24d86dacb04ca0 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/1112] 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 34daa379a504f4306a0135f84dc5b59c5c52e1b2 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/1112] 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 a28932546ba0d11173eeeabbf21fe62716e26e57 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/1112] 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 98cb38fb10d72e9d7a239a90282f27c431d25a18 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/1112] 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 e183990c3582e0b4ee5de0c49bcaaef1100c8406 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/1112] 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 283a001adf007d069334b61e74da6789842c413c 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/1112] 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 c2429bbe7f86d2055e84c0c8b8723b9446a8eb4e 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/1112] 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 56b6e056ef90971902fc791f5f94603eee720b96 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/1112] 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 fcbfd1ec290ff26fbe482bbe21df1daf0664279d 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/1112] 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 7b120f9351659688ec6afe323d9109c5a2966b8d 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/1112] 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 05c9df0858a985c5fbb400d546418ab7b4b71caa 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/1112] 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 d09b28467314ff391e4b7fc239c02b4f6d7d4bcd 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/1112] 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 6a15e435af472cce89af1422ab325b9febe4d595 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/1112] 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 89403542ab3ad4e6c37906c9c22f10a8475b61eb 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/1112] 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 b6eb2118ae2bcdece5710a9e3859d170ec62d2d9 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/1112] 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 47d696e2c8cdcc0bd47a8a6944104d4f23ff6c49 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/1112] 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 dea93d51401f366d8e4bd0203c81643ca8aea415 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/1112] 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 7cfa28c6cc9468b82a870e5756a1252aa741729f 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/1112] 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 a14e1c8546725afea6153cc579c17d0cac1d0ff5 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/1112] 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 aae2247d81322e36b5d060a130e86c36230f80d3 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/1112] 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 c82f577bf14fc5fec5fcfa939a9eefc71a49deb8 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/1112] 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 c7cb75269fa06976a48811146f72d69dffd3d38d 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/1112] 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 f65634371685e658fbdbc00ab4f29b4d8d4cfc7c 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/1112] 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 afe63b004661d2b636011ca4901d6631decaa07b 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/1112] 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 cf64290b569aa181543cb4551a25589f96df261f 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/1112] 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 e882c858a0caec4e58bda69cfd2418ea05be19e7 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/1112] 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 c82c4064d252c070aec46d26fc7ed4207da78589 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/1112] 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 1170417375558525a38c4c976589398fca4960a4 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/1112] 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 dd729b189e25a3d7eec185eb1f2f0daa8f16968a 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/1112] 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 5d425ef9973349ecce8c4df3843cb8ca1fee97a0 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/1112] 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 166cd693104c52d8c07b336f0cdb256499a9c45e 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/1112] 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 636a2455ab3df9072dc3c69dcbce9755e58713ac 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/1112] 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 eb91451ffa1834fb53c416f7700eca6e19abbce3 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/1112] 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 6926f45224f08f5eaab2f1a6fed8fa99f4228e96 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/1112] 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 1e45137950de5da54c1772cb9d7b0687ec69836a 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/1112] python3-occ: rebuild for Python 3.9

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

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 7f74486201ca48fbd2eab617d567fb58ce865685 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/1112] 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 8f566481bb8ea43c7f8580c7a51f0544105fa5f8 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/1112] 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 5ce2a7303a79850d45d4980600f81272ee2b2522 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/1112] python3-orocos-kdl: rebuild for Python 3.9

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

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 5697298b4a45a1d79583b1e981e41e59427cee07 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/1112] 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 ac4f17454560b6f473e94eaca1b965bf4e7c88c8 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/1112] 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 ca8ac06a2fdfbaff8e566c18192f344abd3ac4b5 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/1112] 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 61a82e8184c1ffa58f243b39b9e3c86cff54d463 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/1112] 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 82c7abc2cedebc5c3c509e8eb2ba0581d2496081 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/1112] 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 b59abbf4f0019a98d68581e8902b019bc5b2be98 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/1112] 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 3c66df13b3ef59adec15bdbbd8410134d27cfd5a 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/1112] 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 c1f3dee18e019346d31bf36ab82057158cff915c 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/1112] 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 c8f46a9143f0053c944ef36b3b8ac88b353a7ea2 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/1112] 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 a5cc29871a3fab8cc887b2370297d2e6dc22133d 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/1112] 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 f7b579ad46c0a7c9ae529823c9281d4eb56aed74 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/1112] 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 695f2e6b096188303fc753bee9ab51df83ed0504 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/1112] 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 81c292d9268034aa1576d4eaf56ed50503ab9e02 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/1112] 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 e55cdb3e8d717c7e624ca8b5e601e4ba4d7a49ca 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/1112] 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 8e5389a56aec15390c6491fcb038e58b0a9814e7 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/1112] 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 84e63db10a33a14c038fd6cedc7f36b9183e3ef4 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/1112] 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 78b2efece67d0c48d031560e8a1ca2c170cead2c 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/1112] 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 9a48620b74aaa22ad9ff8ce265f54628b365b80c 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/1112] 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 c82747672ce28d7b26ab69454eebacb48ab9effd 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/1112] 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 a135eb01d03e0772220718cfe03e40f1dd52c489 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/1112] 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 b85ae950fbd16a372110714cc0c16f5d2d859726 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/1112] 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 cc7ccc54831dc4237bd7d1ced8148f0148c13431 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/1112] 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 16595744509c4affd5cb74b7ba6799834fe09579 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/1112] 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 8a6bc40b99993233d1fb777fdc8f2fb41522d1d8 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/1112] 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 72be9202af9429821d77c4646569df3b6910e918 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/1112] 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 6e94c5749a010659967f9b1c14b7db49cc3c5c22 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/1112] 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 b1b71bff1179f06589388e6360ca5cb19118b43f 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/1112] 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 f1896e52672db072165da07d77d95359c24e110c 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/1112] 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 0d804357011335a31b52130507b724e26be8497b 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/1112] 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 1b8a5cc5efc00732205491daa12a56b4e16de532 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/1112] 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 8da17d1eec644c0dc0f5ed36200a936c174dab1b 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/1112] 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 32b2901533c005e340bd72d4db03241b937ed05c 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/1112] 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 d3223a2dac53f5555d1f764508aa61a070e2f98d 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/1112] 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 ba0e8556042d8ab251f8f622cca1d37161b41644 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/1112] 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 309eead83366d07ca79244851c1f034cc0d96caa 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/1112] 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 8470b91866348735787d77264d5fb91fcb8da26f 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/1112] 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 f3d24e1902adb80f1d0c459c8eb6eb2b50496471 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/1112] 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 8b46883767048a5926d1fd9ff46016d6ec295552 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/1112] 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 d80b06d2499943dbd64adef4a2b39886d3312fd7 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/1112] 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 2cd2120c0e6fa353c196f171065df55eb851b523 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/1112] 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 a16e7bf2d871586c6cc44572c587cf4a0964e7d1 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/1112] 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 b261e7855c206c9906d59bc98e9b82818f48f34c 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/1112] 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 d52264fe32e1a2651b399b4f2fb8a6574c1d5653 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/1112] 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 371a316bec9d9dc7899014d98fbdb2c7ca6f0712 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/1112] 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 49095fb86406613bfdbe7b1526021b6abc8bbbfc 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/1112] 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 d7ce63aabe200e4816dba3ce816b7aa9b21c342d 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/1112] 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 760a14e2a46de03c98e9132fa8b14999d54cd6c9 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/1112] 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 c42f84e7f0cc15e44fee0acb2f9e905271d3d251 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/1112] 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 65715731f614bbf8e318cd3194b300cfd36f1da0 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/1112] 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 8616caaa2982dc182657b99dfa61a6e36f01d0e7 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/1112] 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 e8b75e25264a8107a99f3f53bd72b315b24aa162 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/1112] 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 1e4a5eb2aaaded4557828adab396d6eccf01eded 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/1112] 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 20e378f4ace027ca11cc9be11d2ef3cb29dd5717 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/1112] 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 e3265999e0b579bad0911c29f4187f8b9ec86472 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/1112] 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 58a5ac8e81e6a3ed4dbda8fdcb84af2958030ed8 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/1112] 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 de91a9f5c92bcc05a6d67258afef497f3cd65237 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/1112] 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 cbf72b6c77948030541f33f159fe05e1848cd1ee 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/1112] 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 762b10cd30fb13cea0c3119e5c24c0c520b71bd1 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/1112] 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 16efa387bbf990654b5c329209b7a17d558634ef 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/1112] 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 13ccd92bd82da5415a50a38503720e81bdea1cc9 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/1112] 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 668763044ed3f45abc3d8c28e5a289e82f739292 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/1112] 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 e37bbf8da3b23b38bf6e28378ad6aac78519a647 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/1112] 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 de55f0853a5073218f243a8583cc09da6d81be4f 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/1112] 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 79804e796194bf848065b5de31a35bd9ff84670a 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/1112] 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 dc05ef8e8d56fb94592e714cb7de1f940e8c9a9e 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/1112] 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 c8abde6d76b12d56976487bce147184cd80e045d 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/1112] 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 7f63fd8731cbf251fb36cab0f7f47628dbb67e10 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/1112] 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 92d7c9e2ed15db4a88ebee68c891a69dfba6d2d9 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/1112] 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 1f41ffde1fd7204d4554e98c654bbe7cddc7802b 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/1112] 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 e45335dd0ccfba3e3436355847db6c0ac55cdfc1 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/1112] 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 0c31885fc715b468226164dd96c3c2549f94faf1 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/1112] 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 8b18211af715334580c828d62e6ea82006ee6a5a 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/1112] 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 2845685d93949ec3987ed2af5110d36f93320d55 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/1112] 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 159fce33e96afc991048be2a6c7b519735ce82a8 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/1112] 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 7f39731c60245e73c0336778f9009b531a5741ae 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/1112] 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 cf1a70bd93c25ea79f98b7fa095a0cb9f2e03f3f 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/1112] 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 7e8243a97a7f8e609ce6833eeaf397b3ad4aaf44 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/1112] 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 4545edfaad8016b739e9616a974d2a28a0acc8c7 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/1112] 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 9cac69a8ed93fbdcb8351d7d7e42a5af55ea190a 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/1112] 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 5523cfc3308da11ec057668f97e503b7ad8803b7 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/1112] 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 7fff2854ef74de59975fb429210e03e273eedfda 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/1112] 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 2a7b6da6cdfb78857cffa2292ec22c075edbe645 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/1112] 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 385c08fc326124ed6bc4f5fdc433d31bdb5eb41b 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/1112] 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 2003659597e48a572ddcbded8f8e05132e9eec98 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/1112] 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 d719470d7155d0efe01b8d3eab711c9e6889b0e3 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/1112] 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 0af6fc90d57f7ea2449caeb7d3e7beb00d89449b 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/1112] 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 133835ef4f6ed143af88aaf293020a702f461db9 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/1112] 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 57ab4380654f92877854d80c82bc1300965a6db1 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/1112] 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 c796f613bf335f1108080940eead0acc3a25a45e 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/1112] 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 763d7ff892597976963348e1fcb15e583760febc 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/1112] 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 7db9d2f592c26f0b8b92a91c9544e094a27b839c 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/1112] 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 63c75b8adec714a42a803a8eb91b48d71dd64e41 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/1112] 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 bc920812cd341d43f8763193f90a172900bb8f21 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/1112] 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 9ff1a2b9f4db12e2667ca5db430f0993b447d029 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/1112] 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 b8ada555e295c9b42a7085e2af13aa8440bcaf0b 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/1112] 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 6f9bf8bef0da7ab21078554ab8128f027186888a 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/1112] 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 26b97dabada16228a4db6b6b22dc5842d5d1d4e6 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/1112] 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 42c92bd813c68f21df47e8afc265d970332e9450 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/1112] 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 6ee17a3e04e4fbbc810c6fdd0f5f75d792eb44df 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/1112] 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 edbd8d10f6732fc984446de2967212215fe9fd4b 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/1112] 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 27de8e702498ca59e548e85f6f47df242c0ee921 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/1112] 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 3e23aba61be0bf91927420622ec2c420bfb6b872 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/1112] 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 94e9532dc075593f830fa70526cfd4c994ad640d 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/1112] 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 85a2f8cd33abbd52c16352ece1795c7624d43d3b 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/1112] 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 45cfca3a88b860caf475679392f38fc708e986f3 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/1112] 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 555cfd3d8b8536cc3406f5ba396de86dad2cc002 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/1112] 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 781004a7c155e020232d146bfb7fdcae9d2c42fa 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/1112] 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 013ca3fab8eeb955d582c11c9aabf707931c2fc8 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/1112] 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 1b3b110e228886038ffe134f2c4cef57efbdfafe 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/1112] 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 d586ae2d452ea81593d772382b4e82bf5654b073 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/1112] 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 9499419db555dc91d8ec0cbc98beba7dad7d31db 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/1112] 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 29b570cd0026dfe988b848a3f7e0f9f4ca8b9619 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/1112] 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 6f56e1c0d03272f00694aa72a68eb5019e1ade93 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/1112] 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 6215506450877bca3eb5e99b056dfee353fa340b 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/1112] 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 c9abf0bdc69ebe9bdbc270c339622ab37e325a03 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/1112] 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 f19845d963e8d062474fe043269e56482d0a282c 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/1112] 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 4ea8a6978d7edae4af462c70e6b3f22709ea2389 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/1112] 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 e39620158c98225259c7ef75a7ed6fadffa67a06 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/1112] 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 e69c93bef930ea360782c040b24e252b6ff2cec1 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/1112] 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 14235f531de129a7889ba755097541eda4f6edd5 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/1112] 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 d469f8d0aa34b720e5c8b3defd83d9de13b7af1a 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/1112] 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 90965eab040fbf7dbd8340233f00cbdfcf55fc44 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/1112] 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 1c365d863000d6c4bfed558e847ff2f17015e00a 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/1112] 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 d6db5342bbf4a49ebf381ca9cb1b42ba073e269f 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/1112] 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 dcbf5534fabc04ccec25dd172b044962749af694 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/1112] 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 e63e23926aa43839d4ed30cc3c6203a716f5197b 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/1112] 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 3d3354892c42dbaa86c801d13111deb04b94dbb6 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/1112] 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 19c13dcfb165c905b76b2b3040b1bc88c99ef6e8 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/1112] 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 0700ae68f0a0e60c301e7959a370ea48e0679ced 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/1112] 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 adeaafc4fb1fd5ad7c3a3e31429d7d41c859d790 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/1112] 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 69eebb0948ac14f50b060e3a5bc7ed38a6988a8a 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/1112] 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 8f0eb5b794ff4d4d40826b2ee3e9a88ef5c17a8a 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/1112] 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 c2ce689a8454af5f00bae3195064b785f1fa791e 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/1112] 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 a37290c7dce0501ee2275d6db77a2f04b25b3f7e 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/1112] 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 fb99f326b3dfe1e87ea40dc5320bccecd009e5a4 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/1112] 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 74e355b42cc7c23221ab058b25340f733b91a6c2 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/1112] 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 b5646764c19babc432b085df043306ff9037b9b8 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/1112] 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 21ebc75c3cda1a291c5c77a6d6ee169165c38c17 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/1112] 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 6dbe9de1f37b44bffc0c313ea366d2187094bfc6 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/1112] python3-ultrajson: rebuild for Python 3.9

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

diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 1784be3596a..475bc2f32e1 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
 version=3.2.0
-revision=1
+revision=2
 wrksrc="ujson-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 04b835a9180aa38132f00cac3f43298a9133df2f 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/1112] 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 c3389cd40a506b0fad1f002bff4431f3ab5c66ac 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/1112] 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 74f9f20bb3fa918934f2dbc414a09b3a20e91034 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/1112] 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 af8c81076066b6daab3ebc157a2dc66aedf08678 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/1112] 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 83217189f5b19c352e3a0480a187057d713e9408 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/1112] 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 e001779db256040293752a67efbbe324e4d69d21 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/1112] 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 919778f229e8aa81fd226548d4c7b12738fd1a50 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/1112] 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 a9521f75d9c2016e20fab82949ebff45b03535f9 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/1112] 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 b198a31cc5ff8f4248a7719f81bdb2b189d398a8 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/1112] 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 a53a1250e3d0de6687dcef00553ea71d02d4c591 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/1112] 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 99b9182f683cc7135659c5fc6e9d0c4e1663f15b 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/1112] 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 b950221665f0a49a5e966d1977bf18c86cc64bd2 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/1112] 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 ab4ab5cbbcd1fb3ecd1bccd941430e63717c60c1 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/1112] 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 03cd7f270e351c405fc16f7358351313e6f5e067 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/1112] 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 7f0c5176db7fdaa8910864b8cf5895a3a1d87dcb 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/1112] 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 2a54842836c252b4cfa0cc09641346b7cd2559f7 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/1112] 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 f0a155f45c11fbdff6b858f28fb2f30c335b544e 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/1112] 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 12ef9eeae9742b86527f074717679266568a91b3 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/1112] 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 44ee47f2a8b66a7e486074f2297ff7a509903335 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/1112] 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 46ea1093b0c4c7a249a530cd3076fa4417d9f149 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/1112] 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 b723030f2162f22ca93f37e61d5892767def5a94 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/1112] 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 2c694c5c60d37b72122d67927989debc67bc5ed3 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/1112] 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 6c6abe1504bd6219cdebbbb99d611bffab201a6b 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/1112] 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 a03e8091dc97d090c09b4325e7d59f4fbf8d7fa5 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/1112] 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 c5c15f6409fab4a07c0bd38185efec04230c12fc 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/1112] 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 0eec34d50b04a13741244b710793d9eaa92bf4fc 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/1112] 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 68b66ffdea18316db9536a3d3c5b0deed5a48da7 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/1112] 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 36e59018f458b6b1d6ed3e9bfde10fb1caeb3c88 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/1112] 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 63700f3475ce0a8b18b22f320877fc9a9b34039d 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/1112] 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 427ca5471a19c8dea497d30ac4c06e256c90fa63 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/1112] 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 6135eb0108e374329f3ddfce5bf796163c6b8bb1 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/1112] 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 3da3585c8bb3dea10ae2bb0dd1ea465b8516b5d0 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/1112] 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 018905fbc70b0c1e32e5fa9a09cafea608a2abf9 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/1112] 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 656cb84fd018bfcd95e8ed0e25ae6e6dd2780b5e 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/1112] 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 97a38858eeb1036a10a8ee960710ce564d45a7b9 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/1112] 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 1eb95f4286ed82be01e857e0a5ddfa276520a24f 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/1112] 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 b9a4de49cf6a31f5ca7c1c3bcc4c9252db3d45c5 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/1112] 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 c63ebe60d9a4d9b13b610d068e97795899cccda9 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/1112] 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 aa8695a4c6cb4d72e0b79e728f04a8d074dff781 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/1112] 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 6420b8a4582a6d5c80b16ae0108b656b25cd8b97 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/1112] 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 4ff36c4537c68006a5f09f4c062873e7bf5ae48f 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/1112] 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 55f439abaf6c11ce6a51d1626df4e4b9cc5aca11 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/1112] 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 b7a3a78398a625815141c390211665d254865007 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/1112] 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 ed86edc7ace3cb51d6ba167e3a17d89688c4b945 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/1112] 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 fa95c48adfd2ceb4bc1d0e162814574e05c3b4c4 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/1112] 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 774e2467c020ab3002e3b79423267de08386f4b3 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/1112] 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 d1e1fdf28242e12f17ab571c3d75bcb7c89188b1 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/1112] 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 facd1a4bacc244f21064a4806cbe1cce58587578 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/1112] 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 db5f0b61629990308ca08cef355ac6232d5c3700 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/1112] 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 1dfefc7bf038fe31eb21c095a1aab8b30e23365d 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/1112] 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 2ad7a18c65a2e76fd78291733455f887c1fc4a65 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/1112] 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 aee5f70a0cde0a0586464faabe1ad1536803cb51 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/1112] 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 ee1d18eb2526dbefe5affc07af30653cfb834e34 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/1112] 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 a35bee3beb9a942e2332054e5e1b8f8bd939d386 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/1112] 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 062b79a2cd1446d3c47081a1c7f53cfd71b49d43 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/1112] 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 22871fb4972aaa63b582ce0dc643ec94ec0be648 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/1112] 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 b18d6c5bba5f558bc80fd17fecf7bcb47a6aad70 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/1112] 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 96a07ae039d353170ee6bb748bff8c79e8ac5523 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/1112] 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 41809a9346c701d0e42378c801e5366dc60898fa 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/1112] 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 99f0011261b1ac0e6fd0375037fff7bf65702da0 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/1112] 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 885f8e9c6b9efe0eb03952e42e7d2bc113d8bc9c 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/1112] 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 b07747f4b7b003bb61242c5d9544f380df13914b 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/1112] 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 7c0b7952d62fe46d9c8a614413cb3cdf80735e84 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/1112] 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 2d26b845443a3993cb653da58b850ccbe81c718e 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/1112] 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 13923b2cc62fc6eb1f971ff6ad7a543f91754788 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/1112] 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 d436fb8415ff015321c6d517dda424885f836ec1 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/1112] 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 b3a8074d1b6c72d3f1c54da3c09895935c394a8e 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/1112] 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 f047239927f0f7c35e223bbea850e99900d0524c 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/1112] 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 f95a9c6c092019e1913be455581bd1ef476be477 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/1112] 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 79801d0b4546e8d5309df882ebdfb8e0a2a4e00c 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/1112] 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 ecd25ca3e5016847f6d81690420f5dc5f2b0f25e 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/1112] 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 bb90b4fdc7d36e63932115cde3377137affd5f98 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/1112] 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 529a7f5b953817cd93ccf8c44bbdaa556aa6ae16 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/1112] 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 b39a321f5c3f0ae235bb1cacc4825ca3739b3ace 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/1112] 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 45f0a30f9cd430353fb9520509ce855eb3eb3224 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/1112] 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 4865fdba38ca47cdc3fc5417623a10482fe26817 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/1112] 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 e4d06f71e28113292f0f4a6e6abdf3b9ab766a7b 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/1112] 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 22a34e2bf3bd27ed04bc21d0525bc6911c36be37 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/1112] 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 10119b7b82eed10def0578e39a8d61460fa78954 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/1112] 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 1fd5c1c46210d8045b9d37b918d8727dbddcd710 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/1112] 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 f7532489b30a7c49325bf45690777a01d7a8dbe9 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/1112] 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 db394f64c57c36443dff80bc5fa7e1cbe8c6a950 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/1112] 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 5252f5a85d54f00b6364261a7368bb58ba7195dc 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/1112] 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 beb5c1cdc12b6a73039963d771d63dc27bf9e216 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/1112] 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 0a43af16358b3ff857eb0b6ce8368f7e22a2732c 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/1112] 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 b20504f49a29a2409ea0d74c259fa4f61d4dd50c 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/1112] 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 5d6cec17928816a20566556e83f5078589ca0a8f 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/1112] 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 8f2584e19262627060b545613e0dd008b36c70e3 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/1112] 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 9b278d161b0dd1ea029e9a7bc3f46a1fc29c91db 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/1112] 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 0dfea958dbab583e4d1e6d7f9efb60922cdd4a31 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/1112] 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 4074c2733b993ab738edd16cebcd9cc3c335c409 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/1112] 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 53e8a6e70958194050d1f8a8906c7e8db597de58 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/1112] 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 0d100c68f305bf7b00d06bf91c21f5d7cbb917e5 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/1112] 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 367f1936a4cc97153e82dca31fc85fc69e46a533 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 8 Oct 2020 01:32:12 -0400
Subject: [PATCH 1112/1112] fixup! paraview: rebuild for Python 3.9

[ci skip]
---
 srcpkgs/paraview/template | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index da841114a39..20a7f558967 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -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
 }

  parent reply	other threads:[~2020-10-08  5:33 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 [this message]
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
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=20201008053301.0OLKM_PVwqL_9WICn8wVh31zVi0ITlrrCneWrRLLZr4@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).