Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Python 2 drop (cont'd) #24995
@ 2020-09-21 11:43 sgn
  2020-09-23 14:44 ` [PR PATCH] [Updated] " sgn
  2020-09-24 15:09 ` [PR PATCH] [Closed]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2020-09-21 11:43 UTC (permalink / raw)
  To: ml

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

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages python-2-drop-2
https://github.com/void-linux/void-packages/pull/25008

Python 2 drop (cont'd) #24995
Continue of #24995, split for Travis

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

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

From 676d5cb76bbfa9cce94e4b271f6dee393a027cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:39:29 +0700
Subject: [PATCH 001/112] python-npyscreen: drop package

---
 srcpkgs/python-npyscreen/template  | 31 ------------------------------
 srcpkgs/python3-npyscreen          |  1 -
 srcpkgs/python3-npyscreen/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-npyscreen/template
 delete mode 120000 srcpkgs/python3-npyscreen
 create mode 100644 srcpkgs/python3-npyscreen/template

diff --git a/srcpkgs/python-npyscreen/template b/srcpkgs/python-npyscreen/template
deleted file mode 100644
index 2223850f22e..00000000000
--- a/srcpkgs/python-npyscreen/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-npyscreen'
-pkgname=python-npyscreen
-version=4.10.5.1
-revision=2
-wrksrc="npyscreen-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-pycompile_module="npyscreen"
-depends="python"
-short_desc="Python2 widget library and application framework for TUIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/bad-day/npyscreen"
-distfiles="https://github.com/bad-day/npyscreen/archive/${version}.tar.gz"
-checksum=6703c22d6bad3131b075d7d242c611a3c7ba8eae03f6d3cb414e3d35dae94b29
-archs=noarch
-
-post_install() {
-	vlicense LICENCE
-}
-
-python3-npyscreen_package() {
-	archs=noarch
-	pycompile_module="npyscreen"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENCE
-	}
-}
diff --git a/srcpkgs/python3-npyscreen b/srcpkgs/python3-npyscreen
deleted file mode 120000
index d55b0594563..00000000000
--- a/srcpkgs/python3-npyscreen
+++ /dev/null
@@ -1 +0,0 @@
-python-npyscreen
\ No newline at end of file
diff --git a/srcpkgs/python3-npyscreen/template b/srcpkgs/python3-npyscreen/template
new file mode 100644
index 00000000000..f9d29115bfe
--- /dev/null
+++ b/srcpkgs/python3-npyscreen/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-npyscreen'
+pkgname=python3-npyscreen
+version=4.10.5.1
+revision=3
+wrksrc="npyscreen-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 widget library and application framework for TUIs"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/bad-day/npyscreen"
+distfiles="https://github.com/bad-day/npyscreen/archive/${version}.tar.gz"
+checksum=6703c22d6bad3131b075d7d242c611a3c7ba8eae03f6d3cb414e3d35dae94b29
+
+post_install() {
+	vlicense LICENCE
+}

From 07cf96c9451a4339ef312890331187338e6dcf1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:40:40 +0700
Subject: [PATCH 002/112] python-nose2: drop package

---
 srcpkgs/python-nose2/template                 | 37 -------------------
 srcpkgs/python3-nose2                         |  1 -
 .../patches/no-versioned-nose2.patch          |  0
 srcpkgs/python3-nose2/template                | 19 ++++++++++
 4 files changed, 19 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-nose2/template
 delete mode 120000 srcpkgs/python3-nose2
 rename srcpkgs/{python-nose2 => python3-nose2}/patches/no-versioned-nose2.patch (100%)
 create mode 100644 srcpkgs/python3-nose2/template

diff --git a/srcpkgs/python-nose2/template b/srcpkgs/python-nose2/template
deleted file mode 100644
index 058abbd4253..00000000000
--- a/srcpkgs/python-nose2/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-nose2'
-pkgname=python-nose2
-version=0.8.0
-revision=2
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="nose2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-coverage python-six python-mock"
-short_desc="The next generation of nicer testing (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/nose-devs/nose2"
-distfiles="${PYPI_SITE}/n/nose2/nose2-${version}.tar.gz"
-checksum=9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3
-alternatives="nose2:nose2:/usr/bin/python2-nose2"
-
-post_install() {
-	vlicense license.txt
-	# XXX override the default naming scheme
-	cp -a ${DESTDIR}/usr/bin/nose2 ${DESTDIR}/usr/bin/python3-nose2
-	mv ${DESTDIR}/usr/bin/nose2 ${DESTDIR}/usr/bin/python2-nose2
-}
-
-python3-nose2_package() {
-	archs=noarch
-	pycompile_module="nose2"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools python3-coverage python3-six"
-	alternatives="nose2:nose2:/usr/bin/python3-nose2"
-	pkg_install() {
-		vmove usr/bin/python3-nose2
-		vmove usr/lib/python3*
-		vlicense license.txt
-	}
-}
diff --git a/srcpkgs/python3-nose2 b/srcpkgs/python3-nose2
deleted file mode 120000
index 28ad1fd5002..00000000000
--- a/srcpkgs/python3-nose2
+++ /dev/null
@@ -1 +0,0 @@
-python-nose2
\ No newline at end of file
diff --git a/srcpkgs/python-nose2/patches/no-versioned-nose2.patch b/srcpkgs/python3-nose2/patches/no-versioned-nose2.patch
similarity index 100%
rename from srcpkgs/python-nose2/patches/no-versioned-nose2.patch
rename to srcpkgs/python3-nose2/patches/no-versioned-nose2.patch
diff --git a/srcpkgs/python3-nose2/template b/srcpkgs/python3-nose2/template
new file mode 100644
index 00000000000..a21c090356b
--- /dev/null
+++ b/srcpkgs/python3-nose2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nose2'
+pkgname=python3-nose2
+version=0.8.0
+revision=3
+wrksrc="nose2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-coverage python3-six"
+short_desc="Next generation of nicer testing (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/nose-devs/nose2"
+distfiles="${PYPI_SITE}/n/nose2/nose2-${version}.tar.gz"
+checksum=9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3
+conflicts="python-nose2>=0"
+
+post_install() {
+	vlicense license.txt
+}

From 6c5e056870ef82077acc9ce796adc32094922177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:44:45 +0700
Subject: [PATCH 003/112] python-netaddr: drop package

---
 srcpkgs/python-netaddr/template  | 34 --------------------------------
 srcpkgs/python3-netaddr          |  1 -
 srcpkgs/python3-netaddr/template | 19 ++++++++++++++++++
 3 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-netaddr/template
 delete mode 120000 srcpkgs/python3-netaddr
 create mode 100644 srcpkgs/python3-netaddr/template

diff --git a/srcpkgs/python-netaddr/template b/srcpkgs/python-netaddr/template
deleted file mode 100644
index 20cc1c93134..00000000000
--- a/srcpkgs/python-netaddr/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-netaddr'
-pkgname=python-netaddr
-version=0.7.19
-revision=3
-archs=noarch
-wrksrc="netaddr-${version}"
-build_style=python-module
-pycompile_module="netaddr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 network address manipulation library"
-maintainer="Felix Hanley <felix@userspace.com.au>"
-homepage="https://github.com/drkjam/netaddr/"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/n/netaddr/netaddr-${version}.tar.gz"
-checksum=38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd
-alternatives="netaddr:netaddr:/usr/bin/netaddr2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-netaddr_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="netaddr"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="netaddr:netaddr:/usr/bin/netaddr3"
-	pkg_install() {
-		vmove usr/bin/netaddr3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-netaddr b/srcpkgs/python3-netaddr
deleted file mode 120000
index 4ab5a21db48..00000000000
--- a/srcpkgs/python3-netaddr
+++ /dev/null
@@ -1 +0,0 @@
-python-netaddr
\ No newline at end of file
diff --git a/srcpkgs/python3-netaddr/template b/srcpkgs/python3-netaddr/template
new file mode 100644
index 00000000000..4d6d5161b34
--- /dev/null
+++ b/srcpkgs/python3-netaddr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-netaddr'
+pkgname=python3-netaddr
+version=0.7.19
+revision=4
+wrksrc="netaddr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 network address manipulation library"
+maintainer="Felix Hanley <felix@userspace.com.au>"
+license="BSD-3-Clause"
+homepage="https://github.com/drkjam/netaddr/"
+distfiles="${PYPI_SITE}/n/netaddr/netaddr-${version}.tar.gz"
+checksum=38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd
+conflicts="python-netaddr>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From b80db31a4b8c69ad3b999e1411a84102836e7c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:50:05 +0700
Subject: [PATCH 004/112] python-namedlist: drop package

---
 srcpkgs/python-namedlist/template             | 26 -------------------
 srcpkgs/python3-namedlist                     |  1 -
 srcpkgs/python3-namedlist/template            | 14 ++++++++++
 .../update                                    |  0
 4 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-namedlist/template
 delete mode 120000 srcpkgs/python3-namedlist
 create mode 100644 srcpkgs/python3-namedlist/template
 rename srcpkgs/{python-namedlist => python3-namedlist}/update (100%)

diff --git a/srcpkgs/python-namedlist/template b/srcpkgs/python-namedlist/template
deleted file mode 100644
index f3698e39e10..00000000000
--- a/srcpkgs/python-namedlist/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-namedlist'
-pkgname=python-namedlist
-version=1.8
-revision=1
-archs=noarch
-wrksrc="namedlist-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="namedlist.py"
-short_desc="Similar to namedtuple, but instances are mutable"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="https://gitlab.com/ericvsmith/namedlist"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/n/namedlist/namedlist-${version}.tar.gz"
-checksum=34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef
-
-python3-namedlist_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="namedlist.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-namedlist b/srcpkgs/python3-namedlist
deleted file mode 120000
index df1c7622ef2..00000000000
--- a/srcpkgs/python3-namedlist
+++ /dev/null
@@ -1 +0,0 @@
-python-namedlist
\ No newline at end of file
diff --git a/srcpkgs/python3-namedlist/template b/srcpkgs/python3-namedlist/template
new file mode 100644
index 00000000000..1d947ec4cfd
--- /dev/null
+++ b/srcpkgs/python3-namedlist/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-namedlist'
+pkgname=python3-namedlist
+version=1.8
+revision=2
+wrksrc="namedlist-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Similar to namedtuple, but instances are mutable"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://gitlab.com/ericvsmith/namedlist"
+distfiles="${PYPI_SITE}/n/namedlist/namedlist-${version}.tar.gz"
+checksum=34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef
diff --git a/srcpkgs/python-namedlist/update b/srcpkgs/python3-namedlist/update
similarity index 100%
rename from srcpkgs/python-namedlist/update
rename to srcpkgs/python3-namedlist/update

From f9d27998e3d6e2597b101a76bc603f24f51d8553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:50:32 +0700
Subject: [PATCH 005/112] python-mygpoclient: drop package

---
 srcpkgs/python-mygpoclient/template  | 39 ----------------------------
 srcpkgs/python3-mygpoclient          |  1 -
 srcpkgs/python3-mygpoclient/template | 19 ++++++++++++++
 3 files changed, 19 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/python-mygpoclient/template
 delete mode 120000 srcpkgs/python3-mygpoclient
 create mode 100644 srcpkgs/python3-mygpoclient/template

diff --git a/srcpkgs/python-mygpoclient/template b/srcpkgs/python-mygpoclient/template
deleted file mode 100644
index ffad63a70a1..00000000000
--- a/srcpkgs/python-mygpoclient/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-mygpoclient'
-pkgname=python-mygpoclient
-version=1.8
-revision=3
-archs=noarch
-wrksrc="mygpoclient-${version}"
-build_style=python-module
-pycompile_module="mygpoclient"
-hostmakedepends="python-devel python3-devel"
-depends="python"
-short_desc="Client Library for gpodder.net (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/gpodder/mygpoclient"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=65fcb3ab220a2ba2d32a77f969b423a2f663413b6c485b7b02e5a955b28e68d2
-alternatives="
- mygpoclient:mygpo-bpsync:/usr/bin/mygpo-bpsync2
- mygpoclient:mygpo-list-devices:/usr/bin/mygpo-list-devices2
- mygpoclient:mygpo-simple-client:/usr/bin/mygpo-simple-client2"
-
-pre_build() {
-       sed -i '/share\/man\/man1/d' setup.py
-}
-
-python3-mygpoclient_package() {
-	alternatives="
-	 mygpoclient:mygpo-bpsync:/usr/bin/mygpo-bpsync3
-	 mygpoclient:mygpo-list-devices:/usr/bin/mygpo-list-devices3
-	 mygpoclient:mygpo-simple-client:/usr/bin/mygpo-simple-client3"
-	short_desc="${short_desc/Python2/Python3}"
-	pycompile_module="mygpoclient"
-	archs=noarch
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmove usr/bin/mygpo-*3
-	}
-}
diff --git a/srcpkgs/python3-mygpoclient b/srcpkgs/python3-mygpoclient
deleted file mode 120000
index b1c69e6b817..00000000000
--- a/srcpkgs/python3-mygpoclient
+++ /dev/null
@@ -1 +0,0 @@
-python-mygpoclient
\ No newline at end of file
diff --git a/srcpkgs/python3-mygpoclient/template b/srcpkgs/python3-mygpoclient/template
new file mode 100644
index 00000000000..4e7c97ea1b6
--- /dev/null
+++ b/srcpkgs/python3-mygpoclient/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mygpoclient'
+pkgname=python3-mygpoclient
+version=1.8
+revision=4
+wrksrc="mygpoclient-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel"
+depends="python3"
+short_desc="Client Library for gpodder.net (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gpodder/mygpoclient"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=65fcb3ab220a2ba2d32a77f969b423a2f663413b6c485b7b02e5a955b28e68d2
+conflicts="python-mygpoclient>=0"
+
+pre_build() {
+	sed -i '/share\/man\/man1/d' setup.py
+}

From 930034cf5af689a21076a529e5fb005e16fc5663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:50:52 +0700
Subject: [PATCH 006/112] python-mysqlclient: drop package

---
 srcpkgs/python-mysqlclient/template           | 23 -------------------
 srcpkgs/python3-mysqlclient                   |  1 -
 srcpkgs/python3-mysqlclient/template          | 14 +++++++++++
 .../update                                    |  0
 4 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/python-mysqlclient/template
 delete mode 120000 srcpkgs/python3-mysqlclient
 create mode 100644 srcpkgs/python3-mysqlclient/template
 rename srcpkgs/{python-mysqlclient => python3-mysqlclient}/update (100%)

diff --git a/srcpkgs/python-mysqlclient/template b/srcpkgs/python-mysqlclient/template
deleted file mode 100644
index 079666a6dab..00000000000
--- a/srcpkgs/python-mysqlclient/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-mysqlclient'
-pkgname=python-mysqlclient
-version=1.3.14
-revision=3
-wrksrc="mysqlclient-${version}"
-build_style=python-module
-pycompile_module="MySQLdb _mysql_exceptions.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="libmysqlclient-devel python-devel python3-devel zlib-devel libressl-devel"
-short_desc="Python2 interface to MySQL/MariaDB"
-maintainer="Alin Dobre <alin.dobre@outlook.com>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/PyMySQL/mysqlclient-python"
-distfiles="${PYPI_SITE}/m/mysqlclient/mysqlclient-${version}.tar.gz"
-checksum=3981ae9ce545901a36a8b7aed76ed02960a429f75dc53b7ad77fb2f9ab7cd56b
-
-python3-mysqlclient_package() {
-	pycompile_module="MySQLdb _mysql_exceptions.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-mysqlclient b/srcpkgs/python3-mysqlclient
deleted file mode 120000
index 75f09be07de..00000000000
--- a/srcpkgs/python3-mysqlclient
+++ /dev/null
@@ -1 +0,0 @@
-python-mysqlclient
\ No newline at end of file
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
new file mode 100644
index 00000000000..5685da31ab8
--- /dev/null
+++ b/srcpkgs/python3-mysqlclient/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-mysqlclient'
+pkgname=python3-mysqlclient
+version=1.3.14
+revision=3
+wrksrc="mysqlclient-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="libmysqlclient-devel python3-devel zlib-devel libressl-devel"
+short_desc="Python3 interface to MySQL/MariaDB"
+maintainer="Alin Dobre <alin.dobre@outlook.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/PyMySQL/mysqlclient-python"
+distfiles="${PYPI_SITE}/m/mysqlclient/mysqlclient-${version}.tar.gz"
+checksum=3981ae9ce545901a36a8b7aed76ed02960a429f75dc53b7ad77fb2f9ab7cd56b
diff --git a/srcpkgs/python-mysqlclient/update b/srcpkgs/python3-mysqlclient/update
similarity index 100%
rename from srcpkgs/python-mysqlclient/update
rename to srcpkgs/python3-mysqlclient/update

From 61a22d3835fac23dd9e9bbe312c9b8191bc25312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:52:20 +0700
Subject: [PATCH 007/112] python-munkres: drop package

---
 srcpkgs/python-munkres/template | 17 -----------------
 srcpkgs/python-munkres/update   |  2 --
 2 files changed, 19 deletions(-)
 delete mode 100644 srcpkgs/python-munkres/template
 delete mode 100644 srcpkgs/python-munkres/update

diff --git a/srcpkgs/python-munkres/template b/srcpkgs/python-munkres/template
deleted file mode 100644
index 97694aeac84..00000000000
--- a/srcpkgs/python-munkres/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-munkres'
-pkgname=python-munkres
-version=1.0.12
-revision=1
-archs=noarch
-wrksrc="munkres-release-${version}"
-build_style=python2-module
-pycompile_module="munkres.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Algorithm for the Assignment Problem (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/bmc/munkres"
-changelog="https://github.com/bmc/munkres/blob/master/CHANGELOG.md"
-distfiles="https://github.com/bmc/munkres/archive/release-${version}.tar.gz"
-checksum=70b3b32b4fed3b354e5c42e4d1273880a33a13ab8c108a4247140eb661767a0b
diff --git a/srcpkgs/python-munkres/update b/srcpkgs/python-munkres/update
deleted file mode 100644
index 336cd063743..00000000000
--- a/srcpkgs/python-munkres/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=release
-ignore=1.1.*

From 4464f84b469a204803ad9f51c917628dbcb0a034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:52:44 +0700
Subject: [PATCH 008/112] python-mtranslate: drop package

---
 srcpkgs/python-mtranslate/template  | 31 -----------------------------
 srcpkgs/python3-mtranslate          |  1 -
 srcpkgs/python3-mtranslate/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-mtranslate/template
 delete mode 120000 srcpkgs/python3-mtranslate
 create mode 100644 srcpkgs/python3-mtranslate/template

diff --git a/srcpkgs/python-mtranslate/template b/srcpkgs/python-mtranslate/template
deleted file mode 100644
index 992c7b76fe9..00000000000
--- a/srcpkgs/python-mtranslate/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-mtranslate'
-pkgname=python-mtranslate
-version=1.6
-revision=2
-archs=noarch
-wrksrc="mtranslate-${version}"
-build_style=python-module
-pycompile_module="mtranslate"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple api for google translate"
-maintainer="Benjamín Albiñana <benalb@gmail.com>"
-license="MIT"
-homepage="https://github.com/mouuff/mtranslate"
-distfiles="https://github.com/mouuff/mtranslate/archive/${version}.tar.gz"
-checksum=58fe274c692717a6e22acaf8712014a4ba1bd9a09409d246f31796f6f0117385
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-mtranslate_package() {
-	archs=noarch
-	pycompile_module="mtranslate"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-mtranslate b/srcpkgs/python3-mtranslate
deleted file mode 120000
index 6744c8f5a48..00000000000
--- a/srcpkgs/python3-mtranslate
+++ /dev/null
@@ -1 +0,0 @@
-python-mtranslate
\ No newline at end of file
diff --git a/srcpkgs/python3-mtranslate/template b/srcpkgs/python3-mtranslate/template
new file mode 100644
index 00000000000..e15e054b90e
--- /dev/null
+++ b/srcpkgs/python3-mtranslate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-mtranslate'
+pkgname=python3-mtranslate
+version=1.6
+revision=3
+wrksrc="mtranslate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple api for google translate"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="MIT"
+homepage="https://github.com/mouuff/mtranslate"
+distfiles="https://github.com/mouuff/mtranslate/archive/${version}.tar.gz"
+checksum=58fe274c692717a6e22acaf8712014a4ba1bd9a09409d246f31796f6f0117385
+
+post_install() {
+	vlicense LICENSE
+}

From b0d5e300100a8eaa20a64470fe7e49ff4cd2ea7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:54:08 +0700
Subject: [PATCH 009/112] python-mpd2: drop package

---
 srcpkgs/python-mpd2/template  | 30 ------------------------------
 srcpkgs/python3-mpd2          |  1 -
 srcpkgs/python3-mpd2/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-mpd2/template
 delete mode 120000 srcpkgs/python3-mpd2
 create mode 100644 srcpkgs/python3-mpd2/template

diff --git a/srcpkgs/python-mpd2/template b/srcpkgs/python-mpd2/template
deleted file mode 100644
index 0389f8c2a28..00000000000
--- a/srcpkgs/python-mpd2/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-mpd2'
-pkgname=python-mpd2
-version=1.0.0
-revision=2
-archs=noarch
-build_style=python-module
-pycompile_module="mpd"
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-Twisted python-mock"
-depends="python"
-short_desc="Python2 MPD client library"
-maintainer="Jens E. Becker <v2px@v2px.de>"
-homepage="https://github.com/Mic92/python-mpd2"
-license="LGPL-2.1-or-later"
-distfiles="https://github.com/Mic92/python-mpd2/archive/v${version}.tar.gz"
-checksum=877fa1685a56815107cb0b1eb004e7fe261b620fafd4d38cdaa2b6f3edd35928
-
-do_check() {
-	python2 -m unittest mpd.tests
-}
-
-python3-mpd2_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="mpd"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-mpd2 b/srcpkgs/python3-mpd2
deleted file mode 120000
index 27660282c4e..00000000000
--- a/srcpkgs/python3-mpd2
+++ /dev/null
@@ -1 +0,0 @@
-python-mpd2
\ No newline at end of file
diff --git a/srcpkgs/python3-mpd2/template b/srcpkgs/python3-mpd2/template
new file mode 100644
index 00000000000..794212831f7
--- /dev/null
+++ b/srcpkgs/python3-mpd2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mpd2'
+pkgname=python3-mpd2
+version=1.0.0
+revision=3
+wrksrc=python-mpd2-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-Twisted python3-mock"
+short_desc="Python3 MPD client library"
+maintainer="Jens E. Becker <v2px@v2px.de>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/Mic92/python-mpd2"
+distfiles="https://github.com/Mic92/python-mpd2/archive/v${version}.tar.gz"
+checksum=877fa1685a56815107cb0b1eb004e7fe261b620fafd4d38cdaa2b6f3edd35928
+
+do_check() {
+	python3 -m unittest mpd.tests
+}

From c1543328387f39020b2f7c839bffc3d103937342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:57:03 +0700
Subject: [PATCH 010/112] python-fasteners: drop package

---
 srcpkgs/python-fasteners/template             | 26 -------------------
 srcpkgs/python3-fasteners                     |  1 -
 .../patches/fasteners-monotonic.patch         |  0
 srcpkgs/python3-fasteners/template            | 14 ++++++++++
 4 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-fasteners/template
 delete mode 120000 srcpkgs/python3-fasteners
 rename srcpkgs/{python-fasteners => python3-fasteners}/patches/fasteners-monotonic.patch (100%)
 create mode 100644 srcpkgs/python3-fasteners/template

diff --git a/srcpkgs/python-fasteners/template b/srcpkgs/python-fasteners/template
deleted file mode 100644
index 24d2ec0611f..00000000000
--- a/srcpkgs/python-fasteners/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-fasteners'
-pkgname=python-fasteners
-version=0.15
-revision=2
-archs=noarch
-wrksrc="fasteners-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-monotonic python-six"
-pycompile_module="fasteners"
-short_desc="Python2 package that provides useful locks"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="https://pypi.org/project/fasteners/"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/fasteners/fasteners-${version}.tar.gz"
-checksum=3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef
-
-python3-fasteners_package() {
-	archs=noarch
-	depends="python3-six"
-	pycompile_module="fasteners"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-fasteners b/srcpkgs/python3-fasteners
deleted file mode 120000
index 0ca3f5f1810..00000000000
--- a/srcpkgs/python3-fasteners
+++ /dev/null
@@ -1 +0,0 @@
-python-fasteners
\ No newline at end of file
diff --git a/srcpkgs/python-fasteners/patches/fasteners-monotonic.patch b/srcpkgs/python3-fasteners/patches/fasteners-monotonic.patch
similarity index 100%
rename from srcpkgs/python-fasteners/patches/fasteners-monotonic.patch
rename to srcpkgs/python3-fasteners/patches/fasteners-monotonic.patch
diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template
new file mode 100644
index 00000000000..e5e5c7f206a
--- /dev/null
+++ b/srcpkgs/python3-fasteners/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-fasteners'
+pkgname=python3-fasteners
+version=0.15
+revision=3
+wrksrc="fasteners-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Python3 package that provides useful locks"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/fasteners/"
+distfiles="${PYPI_SITE}/f/fasteners/fasteners-${version}.tar.gz"
+checksum=3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef

From 8b5619953222ce030d59e6ad1e7a4ee113bb5536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:02:23 +0700
Subject: [PATCH 011/112] python-mistune: drop package

---
 srcpkgs/python-mistune/template  | 31 -------------------------------
 srcpkgs/python3-mistune          |  1 -
 srcpkgs/python3-mistune/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-mistune/template
 delete mode 120000 srcpkgs/python3-mistune
 create mode 100644 srcpkgs/python3-mistune/template

diff --git a/srcpkgs/python-mistune/template b/srcpkgs/python-mistune/template
deleted file mode 100644
index ef5c054ba75..00000000000
--- a/srcpkgs/python-mistune/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-mistune'
-pkgname=python-mistune
-version=0.8.4
-revision=2
-archs=noarch
-wrksrc="mistune-${version}"
-build_style=python-module
-pycompile_module="mistune.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="The fastest markdown parser for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/lepture/mistune"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/m/mistune/mistune-${version}.tar.gz"
-checksum=59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-mistune_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="mistune.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-mistune b/srcpkgs/python3-mistune
deleted file mode 120000
index 26ea68379b8..00000000000
--- a/srcpkgs/python3-mistune
+++ /dev/null
@@ -1 +0,0 @@
-python-mistune
\ No newline at end of file
diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
new file mode 100644
index 00000000000..9a7f9826e0a
--- /dev/null
+++ b/srcpkgs/python3-mistune/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-mistune'
+pkgname=python3-mistune
+version=0.8.4
+revision=3
+wrksrc="mistune-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Fast markdown parser for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/lepture/mistune"
+distfiles="${PYPI_SITE}/m/mistune/mistune-${version}.tar.gz"
+checksum=59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e
+
+post_install() {
+	vlicense LICENSE
+}

From aa8ad6e6b4b5d6e6fdd10d81b5653d0bd6f2f8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:03:50 +0700
Subject: [PATCH 012/112] python-mccabe: drop package

---
 srcpkgs/python-mccabe/template  | 35 ---------------------------------
 srcpkgs/python3-mccabe          |  1 -
 srcpkgs/python3-mccabe/template | 22 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-mccabe/template
 delete mode 120000 srcpkgs/python3-mccabe
 create mode 100644 srcpkgs/python3-mccabe/template

diff --git a/srcpkgs/python-mccabe/template b/srcpkgs/python-mccabe/template
deleted file mode 100644
index 1e2ed6328b8..00000000000
--- a/srcpkgs/python-mccabe/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-mccabe'
-pkgname=python-mccabe
-version=0.6.1
-revision=3
-archs=noarch
-replaces="mccabe>=0"
-wrksrc="mccabe-${version}"
-build_style=python-module
-pycompile_module="mccabe.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="McCabe complexity checker for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/PyCQA/mccabe"
-license="MIT"
-distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
-checksum=dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f
-
-pre_build() {
-	sed -i '/setup_requires=/d' setup.py
-}
-post_install() {
-	vlicense LICENSE
-}
-
-python3-mccabe_package() {
-	archs=noarch
-	pycompile_module="mccabe.py"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-mccabe b/srcpkgs/python3-mccabe
deleted file mode 120000
index 78bc1fd5f05..00000000000
--- a/srcpkgs/python3-mccabe
+++ /dev/null
@@ -1 +0,0 @@
-python-mccabe
\ No newline at end of file
diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template
new file mode 100644
index 00000000000..58b382f72c4
--- /dev/null
+++ b/srcpkgs/python3-mccabe/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-mccabe'
+pkgname=python3-mccabe
+version=0.6.1
+revision=4
+wrksrc="mccabe-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="McCabe complexity checker for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/PyCQA/mccabe"
+distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
+checksum=dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f
+replaces="mccabe>=0"
+
+pre_build() {
+	vsed -i '/setup_requires=/d' setup.py
+}
+post_install() {
+	vlicense LICENSE
+}

From 653f70cf4bef294660d054dcfd99d4fa0132e082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:05:06 +0700
Subject: [PATCH 013/112] python-markdown2: drop package

---
 srcpkgs/python-markdown2/template  | 40 ------------------------------
 srcpkgs/python3-markdown2          |  1 -
 srcpkgs/python3-markdown2/template | 25 +++++++++++++++++++
 3 files changed, 25 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/python-markdown2/template
 delete mode 120000 srcpkgs/python3-markdown2
 create mode 100644 srcpkgs/python3-markdown2/template

diff --git a/srcpkgs/python-markdown2/template b/srcpkgs/python-markdown2/template
deleted file mode 100644
index e9068f64202..00000000000
--- a/srcpkgs/python-markdown2/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-markdown2'
-pkgname=python-markdown2
-version=2.3.8
-revision=2
-archs=noarch
-build_style=python-module
-pycompile_module="markdown2"
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Fast and complete implementation of Markdown in Python2"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://github.com/trentm/python-markdown2"
-distfiles="https://github.com/trentm/python-markdown2/archive/${version}.tar.gz"
-checksum=@f2439906b925fb3991b8e4c01909bd2e6cb3aa75ce64a053b5495f9c72726f77
-
-do_check() {
-	PY2PATH="${PWD}/build-2.7/lib"
-	PY3PATH="${PWD}/build-${py3_ver}/lib"
-
-	cd test
-	# On python2 markdown2/phpmarkdown/email_auto_links is broken;
-	# cf. https://github.com/trentm/python-markdown2/issues/5
-	#PYTHONPATH="${PY2PATH}" python2 test.py -- -knownfailure
-	PYTHONPATH="${PY3PATH}" python3 test.py -- -knownfailure
-}
-
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-markdown2_package() {
-	archs=noarch
-	pycompile_module="markdown2"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-markdown2 b/srcpkgs/python3-markdown2
deleted file mode 120000
index e6e6853527b..00000000000
--- a/srcpkgs/python3-markdown2
+++ /dev/null
@@ -1 +0,0 @@
-python-markdown2
\ No newline at end of file
diff --git a/srcpkgs/python3-markdown2/template b/srcpkgs/python3-markdown2/template
new file mode 100644
index 00000000000..b263ff0979f
--- /dev/null
+++ b/srcpkgs/python3-markdown2/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-markdown2'
+pkgname=python3-markdown2
+version=2.3.8
+revision=3
+wrksrc=python-markdown2-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Fast and complete implementation of Markdown in Python3"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://github.com/trentm/python-markdown2"
+distfiles="https://github.com/trentm/python-markdown2/archive/${version}.tar.gz"
+checksum=@f2439906b925fb3991b8e4c01909bd2e6cb3aa75ce64a053b5495f9c72726f77
+
+do_check() {
+	PY3PATH="${PWD}/build/lib"
+
+	cd test
+	PYTHONPATH="${PY3PATH}" python3 test.py -- -knownfailure
+}
+
+
+post_install() {
+	vlicense LICENSE.txt
+}

From f93e59ca6020b6deb689c86210145216405c466d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:05:44 +0700
Subject: [PATCH 014/112] python-magic: drop package

---
 srcpkgs/python-magic/template  | 30 ------------------------------
 srcpkgs/python3-magic          |  1 -
 srcpkgs/python3-magic/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-magic/template
 delete mode 120000 srcpkgs/python3-magic
 create mode 100644 srcpkgs/python3-magic/template

diff --git a/srcpkgs/python-magic/template b/srcpkgs/python-magic/template
deleted file mode 100644
index 6bb26bb6cd2..00000000000
--- a/srcpkgs/python-magic/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-magic'
-pkgname=python-magic
-version=0.4.18
-revision=2
-archs=noarch
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python libmagic"
-short_desc="File type identification using libmagic (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ahupp/python-magic"
-distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
-checksum=b787e8056c115f37e2af11e0b98dc67d5fc182ed5ed827a62f95e3a7f0ed4be4
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-magic_package() {
-	archs=noarch
-	depends="python3 libmagic"
-	# Beware: not an alternative
-	conflicts="python3-file-magic>=0"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-magic b/srcpkgs/python3-magic
deleted file mode 120000
index aee0e39c8c8..00000000000
--- a/srcpkgs/python3-magic
+++ /dev/null
@@ -1 +0,0 @@
-python-magic
\ No newline at end of file
diff --git a/srcpkgs/python3-magic/template b/srcpkgs/python3-magic/template
new file mode 100644
index 00000000000..3adb458996d
--- /dev/null
+++ b/srcpkgs/python3-magic/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-magic'
+pkgname=python3-magic
+version=0.4.18
+revision=3
+wrksrc=python-magic-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="libmagic"
+short_desc="File type identification using libmagic (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ahupp/python-magic"
+distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
+checksum=b787e8056c115f37e2af11e0b98dc67d5fc182ed5ed827a62f95e3a7f0ed4be4
+
+post_install() {
+	vlicense LICENSE
+}

From c3d2c7064f3375394154107fb6c48f812e5c7e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:07:12 +0700
Subject: [PATCH 015/112] python-libtmux: drop package

---
 srcpkgs/python-libtmux/template  | 31 -------------------------------
 srcpkgs/python3-libtmux          |  1 -
 srcpkgs/python3-libtmux/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-libtmux/template
 delete mode 120000 srcpkgs/python3-libtmux
 create mode 100644 srcpkgs/python3-libtmux/template

diff --git a/srcpkgs/python-libtmux/template b/srcpkgs/python-libtmux/template
deleted file mode 100644
index 20f43af5f7d..00000000000
--- a/srcpkgs/python-libtmux/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-libtmux'
-pkgname=python-libtmux
-version=0.8.1
-revision=2
-archs=noarch
-wrksrc="libtmux-${version}"
-build_style=python-module
-pycompile_module="libtmux"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python binding for tmux"
-maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
-license="MIT"
-homepage="https://github.com/tmux-python/libtmux"
-distfiles="${PYPI_SITE}/l/libtmux/libtmux-${version}.tar.gz"
-checksum=5d4963cc4af53046cabd0997152af05a0a419e4c63af6737389b50f637c3852a
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-libtmux_package() {
-	archs=noarch
-	pycompile_module="libtmux"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-libtmux b/srcpkgs/python3-libtmux
deleted file mode 120000
index f02be05dcc2..00000000000
--- a/srcpkgs/python3-libtmux
+++ /dev/null
@@ -1 +0,0 @@
-python-libtmux
\ No newline at end of file
diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template
new file mode 100644
index 00000000000..cc704853b0e
--- /dev/null
+++ b/srcpkgs/python3-libtmux/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-libtmux'
+pkgname=python3-libtmux
+version=0.8.1
+revision=3
+wrksrc="libtmux-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python binding for tmux"
+maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
+license="MIT"
+homepage="https://github.com/tmux-python/libtmux"
+distfiles="${PYPI_SITE}/l/libtmux/libtmux-${version}.tar.gz"
+checksum=5d4963cc4af53046cabd0997152af05a0a419e4c63af6737389b50f637c3852a
+
+post_install() {
+	vlicense LICENSE
+}

From ba2b2a6b4c10235889cc7bf0f6a93559a1d0819a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:07:40 +0700
Subject: [PATCH 016/112] python-kitchen: drop package

---
 srcpkgs/python-kitchen/template  | 26 --------------------------
 srcpkgs/python3-kitchen          |  1 -
 srcpkgs/python3-kitchen/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-kitchen/template
 delete mode 120000 srcpkgs/python3-kitchen
 create mode 100644 srcpkgs/python3-kitchen/template

diff --git a/srcpkgs/python-kitchen/template b/srcpkgs/python-kitchen/template
deleted file mode 100644
index 917131d6d93..00000000000
--- a/srcpkgs/python-kitchen/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-kitchen'
-pkgname=python-kitchen
-version=1.2.6
-revision=3
-archs=noarch
-wrksrc="kitchen-${version}"
-build_style=python-module
-pycompile_module="kitchen"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Useful snippets for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/fedora-infra/kitchen"
-distfiles="https://github.com/fedora-infra/kitchen/archive/${version}.tar.gz"
-checksum=6963dd84819713aafdd55e5314dcce6df5a37430b62fd9c48770e9f1a467b2b0
-
-python3-kitchen_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="kitchen"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-kitchen b/srcpkgs/python3-kitchen
deleted file mode 120000
index 39c60205412..00000000000
--- a/srcpkgs/python3-kitchen
+++ /dev/null
@@ -1 +0,0 @@
-python-kitchen
\ No newline at end of file
diff --git a/srcpkgs/python3-kitchen/template b/srcpkgs/python3-kitchen/template
new file mode 100644
index 00000000000..165899bfbab
--- /dev/null
+++ b/srcpkgs/python3-kitchen/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-kitchen'
+pkgname=python3-kitchen
+version=1.2.6
+revision=4
+wrksrc="kitchen-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Useful snippets for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fedora-infra/kitchen"
+distfiles="https://github.com/fedora-infra/kitchen/archive/${version}.tar.gz"
+checksum=6963dd84819713aafdd55e5314dcce6df5a37430b62fd9c48770e9f1a467b2b0

From f89efa30616040c9d4f47b1ae3e8edb89728c9b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:09:15 +0700
Subject: [PATCH 017/112] python-keepalive: drop package

---
 srcpkgs/python-keepalive/template  | 26 --------------------------
 srcpkgs/python3-keepalive          |  1 -
 srcpkgs/python3-keepalive/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-keepalive/template
 delete mode 120000 srcpkgs/python3-keepalive
 create mode 100644 srcpkgs/python3-keepalive/template

diff --git a/srcpkgs/python-keepalive/template b/srcpkgs/python-keepalive/template
deleted file mode 100644
index 50e1d7e6e78..00000000000
--- a/srcpkgs/python-keepalive/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-keepalive'
-pkgname=python-keepalive
-version=0.5
-revision=4
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="keepalive"
-short_desc="Python2 urllib keepalive support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/wikier/keepalive"
-license="LGPL-2.1"
-distfiles="${PYPI_SITE}/k/keepalive/keepalive-${version}.tar.gz"
-checksum=3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1
-
-python3-keepalive_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="keepalive"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-keepalive b/srcpkgs/python3-keepalive
deleted file mode 120000
index 1fd19ead4ac..00000000000
--- a/srcpkgs/python3-keepalive
+++ /dev/null
@@ -1 +0,0 @@
-python-keepalive
\ No newline at end of file
diff --git a/srcpkgs/python3-keepalive/template b/srcpkgs/python3-keepalive/template
new file mode 100644
index 00000000000..5272922253d
--- /dev/null
+++ b/srcpkgs/python3-keepalive/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-keepalive'
+pkgname=python3-keepalive
+version=0.5
+revision=5
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 urllib keepalive support"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/wikier/keepalive"
+distfiles="${PYPI_SITE}/k/keepalive/keepalive-${version}.tar.gz"
+checksum=3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1

From 5563eafa981154de7ac65febcebf02f8f2fbb1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:09:51 +0700
Subject: [PATCH 018/112] python-kaptan: drop package

---
 srcpkgs/python-kaptan/template  | 34 ---------------------------------
 srcpkgs/python3-kaptan          |  1 -
 srcpkgs/python3-kaptan/template | 19 ++++++++++++++++++
 3 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-kaptan/template
 delete mode 120000 srcpkgs/python3-kaptan
 create mode 100644 srcpkgs/python3-kaptan/template

diff --git a/srcpkgs/python-kaptan/template b/srcpkgs/python-kaptan/template
deleted file mode 100644
index 6668b240008..00000000000
--- a/srcpkgs/python-kaptan/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-kaptan'
-pkgname=python-kaptan
-version=0.5.12
-revision=2
-archs=noarch
-wrksrc="kaptan-${version}"
-build_style=python-module
-pycompile_module="kaptan"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-yaml"
-short_desc="Configuration manager"
-maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
-license="BSD-3-Clause"
-homepage="https://github.com/emre/kaptan"
-distfiles="${PYPI_SITE}/k/kaptan/kaptan-${version}.tar.gz"
-checksum=@b0714c3c0c58006ca6d9fc5528d103685773ed22496d5dd582fbd7efe6a67c7a
-alternatives="kaptan:kaptan:/usr/bin/kaptan2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-kaptan_package() {
-	archs=noarch
-	pycompile_module="kaptan"
-	depends="python3 python3-yaml"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="kaptan:kaptan:/usr/bin/kaptan3"
-	pkg_install() {
-		vmove usr/bin/kaptan3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-kaptan b/srcpkgs/python3-kaptan
deleted file mode 120000
index b631fd50909..00000000000
--- a/srcpkgs/python3-kaptan
+++ /dev/null
@@ -1 +0,0 @@
-python-kaptan
\ No newline at end of file
diff --git a/srcpkgs/python3-kaptan/template b/srcpkgs/python3-kaptan/template
new file mode 100644
index 00000000000..c9af58bf95c
--- /dev/null
+++ b/srcpkgs/python3-kaptan/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-kaptan'
+pkgname=python3-kaptan
+version=0.5.12
+revision=3
+wrksrc="kaptan-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-yaml"
+short_desc="Configuration manager"
+maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
+license="BSD-3-Clause"
+homepage="https://github.com/emre/kaptan"
+distfiles="${PYPI_SITE}/k/kaptan/kaptan-${version}.tar.gz"
+checksum=@b0714c3c0c58006ca6d9fc5528d103685773ed22496d5dd582fbd7efe6a67c7a
+conflicts="python-kaptan>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 7fb4c1e5e196fba7671cf32d602a185c291a77c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:11:32 +0700
Subject: [PATCH 019/112] python-jsonschema: drop package

---
 srcpkgs/python-jsonschema/template  | 42 -----------------------------
 srcpkgs/python3-jsonschema          |  1 -
 srcpkgs/python3-jsonschema/template | 27 +++++++++++++++++++
 3 files changed, 27 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/python-jsonschema/template
 delete mode 120000 srcpkgs/python3-jsonschema
 create mode 100644 srcpkgs/python3-jsonschema/template

diff --git a/srcpkgs/python-jsonschema/template b/srcpkgs/python-jsonschema/template
deleted file mode 100644
index 326b5609d36..00000000000
--- a/srcpkgs/python-jsonschema/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-jsonschema'
-pkgname=python-jsonschema
-reverts="3.0.2_1"
-version=2.6.0
-revision=4
-archs=noarch
-wrksrc="jsonschema-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-functools32"
-pycompile_module="jsonschema"
-short_desc="Implementation of JSON Schema for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/Julian/jsonschema"
-license="MIT"
-distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
-alternatives="jsonschema:jsonschema:/usr/bin/jsonschema2"
-
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
-}
-post_install() {
-	vlicense COPYING LICENSE
-}
-
-python3-jsonschema_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	pycompile_module="jsonschema"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jsonschema:jsonschema:/usr/bin/jsonschema3"
-	pkg_install() {
-		vmove usr/bin/jsonschema3
-		vmove usr/lib/python3*
-		vlicense COPYING LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jsonschema b/srcpkgs/python3-jsonschema
deleted file mode 120000
index 7eeab716dba..00000000000
--- a/srcpkgs/python3-jsonschema
+++ /dev/null
@@ -1 +0,0 @@
-python-jsonschema
\ No newline at end of file
diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
new file mode 100644
index 00000000000..48686ae9a73
--- /dev/null
+++ b/srcpkgs/python3-jsonschema/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-jsonschema'
+pkgname=python3-jsonschema
+reverts="3.0.2_1"
+version=2.6.0
+revision=5
+wrksrc="jsonschema-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Implementation of JSON Schema for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/Julian/jsonschema"
+distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
+checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+conflicts="python-jsonschema>=0"
+
+pre_build() {
+	vsed -i setup.py \
+		-e '/setup_requires/d' \
+		-e '/vcversioner/d' \
+		-e "/name=/a\
+		version=\"${version}\","
+}
+post_install() {
+	vlicense COPYING LICENSE
+}

From 22db1681d4879afa62ed5cfbf59066929ee4e33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:13:55 +0700
Subject: [PATCH 020/112] python-jsonrpclib: drop package

---
 srcpkgs/python-jsonrpclib/template  | 26 --------------------------
 srcpkgs/python3-jsonrpclib          |  1 -
 srcpkgs/python3-jsonrpclib/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-jsonrpclib/template
 delete mode 120000 srcpkgs/python3-jsonrpclib
 create mode 100644 srcpkgs/python3-jsonrpclib/template

diff --git a/srcpkgs/python-jsonrpclib/template b/srcpkgs/python-jsonrpclib/template
deleted file mode 100644
index a245168a824..00000000000
--- a/srcpkgs/python-jsonrpclib/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-jsonrpclib'
-pkgname=python-jsonrpclib
-version=0.4.0
-revision=2
-archs=noarch
-wrksrc="jsonrpclib-pelix-${version}"
-build_style=python-module
-pycompile_module="jsonrpclib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the JSON-RPC v2.0 specification"
-maintainer="Charles E. Lehner <cel@celehner.com>"
-license="Apache-2.0"
-homepage="https://github.com/tcalmant/jsonrpclib"
-distfiles="${PYPI_SITE}/j/jsonrpclib-pelix/jsonrpclib-pelix-${version}.tar.gz"
-checksum=19c558e169a51480b39548783067ca55046b62b2409ab4559931255e12f635de
-
-python3-jsonrpclib_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
-
diff --git a/srcpkgs/python3-jsonrpclib b/srcpkgs/python3-jsonrpclib
deleted file mode 120000
index 20b7851a50e..00000000000
--- a/srcpkgs/python3-jsonrpclib
+++ /dev/null
@@ -1 +0,0 @@
-python-jsonrpclib
\ No newline at end of file
diff --git a/srcpkgs/python3-jsonrpclib/template b/srcpkgs/python3-jsonrpclib/template
new file mode 100644
index 00000000000..3cf4a83073c
--- /dev/null
+++ b/srcpkgs/python3-jsonrpclib/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-jsonrpclib'
+pkgname=python3-jsonrpclib
+version=0.4.0
+revision=3
+wrksrc="jsonrpclib-pelix-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the JSON-RPC v2.0 specification"
+maintainer="Charles E. Lehner <cel@celehner.com>"
+license="Apache-2.0"
+homepage="https://github.com/tcalmant/jsonrpclib"
+distfiles="${PYPI_SITE}/j/jsonrpclib-pelix/jsonrpclib-pelix-${version}.tar.gz"
+checksum=19c558e169a51480b39548783067ca55046b62b2409ab4559931255e12f635de

From 0411634f91db1462fdff53dcef2d671d418025f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:15:44 +0700
Subject: [PATCH 021/112] python-jsonpointer: drop package

---
 srcpkgs/python-jsonpointer/template  | 34 ----------------------------
 srcpkgs/python3-jsonpointer          |  1 -
 srcpkgs/python3-jsonpointer/template | 19 ++++++++++++++++
 3 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-jsonpointer/template
 delete mode 120000 srcpkgs/python3-jsonpointer
 create mode 100644 srcpkgs/python3-jsonpointer/template

diff --git a/srcpkgs/python-jsonpointer/template b/srcpkgs/python-jsonpointer/template
deleted file mode 100644
index fd103d123aa..00000000000
--- a/srcpkgs/python-jsonpointer/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-jsonpointer'
-pkgname=python-jsonpointer
-version=2.0
-revision=2
-archs=noarch
-wrksrc="jsonpointer-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="jsonpointer.py"
-short_desc="Resolve JSON Pointers according to RFC 6901 (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/stefankoegl/python-json-pointer"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz"
-checksum=c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362
-alternatives="jsonpointer:jsonpointer:/usr/bin/jsonpointer2"
-
-post_install() {
-	vlicense LICENSE.txt LICENSE
-}
-
-python3-jsonpointer_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="jsonpointer.py"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jsonpointer:jsonpointer:/usr/bin/jsonpointer3"
-	pkg_install() {
-		vmove usr/bin/jsonpointer3
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jsonpointer b/srcpkgs/python3-jsonpointer
deleted file mode 120000
index af23236e7d6..00000000000
--- a/srcpkgs/python3-jsonpointer
+++ /dev/null
@@ -1 +0,0 @@
-python-jsonpointer
\ No newline at end of file
diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template
new file mode 100644
index 00000000000..f8d27a50d6d
--- /dev/null
+++ b/srcpkgs/python3-jsonpointer/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-jsonpointer'
+pkgname=python3-jsonpointer
+version=2.0
+revision=3
+wrksrc="jsonpointer-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Resolve JSON Pointers according to RFC 6901 (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/stefankoegl/python-json-pointer"
+distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz"
+checksum=c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362
+conflicts="python-jsonpointer>=0"
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From a5c6c9f8c3df4dda02fef778496f56d22b82d4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:16:27 +0700
Subject: [PATCH 022/112] python-botocore: drop package

---
 srcpkgs/python-botocore/template  | 24 ------------------------
 srcpkgs/python3-botocore          |  1 -
 srcpkgs/python3-botocore/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/python-botocore/template
 delete mode 120000 srcpkgs/python3-botocore
 create mode 100644 srcpkgs/python3-botocore/template

diff --git a/srcpkgs/python-botocore/template b/srcpkgs/python-botocore/template
deleted file mode 100644
index 600559839d2..00000000000
--- a/srcpkgs/python-botocore/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-botocore'
-pkgname=python-botocore
-version=1.17.28
-revision=1
-archs=noarch
-wrksrc="botocore-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-dateutil python-docutils python-jmespath python-urllib3"
-short_desc="Core functionality library of boto 3 (Python2)"
-maintainer="Robert Lowry <bobertlo@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/boto/botocore"
-distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=c9a4b4ffedeff89848a899bd4634be46a21a190690b505c2050888c0a5447936
-
-python3-botocore_package() {
-	archs=noarch
-	depends="python3-dateutil python3-docutils python3-jmespath python3-urllib3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-botocore b/srcpkgs/python3-botocore
deleted file mode 120000
index e4216cb4265..00000000000
--- a/srcpkgs/python3-botocore
+++ /dev/null
@@ -1 +0,0 @@
-python-botocore
\ No newline at end of file
diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
new file mode 100644
index 00000000000..d4ac8e92f37
--- /dev/null
+++ b/srcpkgs/python3-botocore/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-botocore'
+pkgname=python3-botocore
+version=1.17.28
+revision=2
+wrksrc="botocore-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-dateutil python3-docutils python3-jmespath python3-urllib3"
+short_desc="Core functionality library of boto 3 (Python3)"
+maintainer="Robert Lowry <bobertlo@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/boto/botocore"
+distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
+checksum=c9a4b4ffedeff89848a899bd4634be46a21a190690b505c2050888c0a5447936

From 94556796444cce77e4c49ca7d4df23e6ad444c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:16:41 +0700
Subject: [PATCH 023/112] python-jmespath: drop package

---
 srcpkgs/python-jmespath/template  | 32 -------------------------------
 srcpkgs/python3-jmespath          |  1 -
 srcpkgs/python3-jmespath/template | 19 ++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-jmespath/template
 delete mode 120000 srcpkgs/python3-jmespath
 create mode 100644 srcpkgs/python3-jmespath/template

diff --git a/srcpkgs/python-jmespath/template b/srcpkgs/python-jmespath/template
deleted file mode 100644
index 6f1dfcecf0f..00000000000
--- a/srcpkgs/python-jmespath/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-jmespath'
-pkgname=python-jmespath
-version=0.10.0
-revision=1
-archs=noarch
-wrksrc="jmespath.py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="JSON Query language for Python2"
-maintainer="yopito <pierre.bourgin@free.fr>"
-license="MIT"
-homepage="http://jmespath.org"
-distfiles="https://github.com/jmespath/jmespath.py/archive/${version}.tar.gz"
-checksum=999b0ef13b798cf04de5451a51201d63a6feaf07c3fdcfbab4e5bca2b4ac653e
-alternatives="jmespath:jp.py:/usr/bin/jp.py2"
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-jmespath_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jmespath:jp.py:/usr/bin/jp.py3"
-	pkg_install() {
-		vlicense LICENSE.txt
-		vmove usr/lib/python3*
-		vmove usr/bin/*3
-	}
-}
diff --git a/srcpkgs/python3-jmespath b/srcpkgs/python3-jmespath
deleted file mode 120000
index a0dad3f3662..00000000000
--- a/srcpkgs/python3-jmespath
+++ /dev/null
@@ -1 +0,0 @@
-python-jmespath
\ No newline at end of file
diff --git a/srcpkgs/python3-jmespath/template b/srcpkgs/python3-jmespath/template
new file mode 100644
index 00000000000..0bcd20e6b28
--- /dev/null
+++ b/srcpkgs/python3-jmespath/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-jmespath'
+pkgname=python3-jmespath
+version=0.10.0
+revision=2
+wrksrc="jmespath.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="JSON Query language for Python3"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="MIT"
+homepage="http://jmespath.org"
+distfiles="https://github.com/jmespath/jmespath.py/archive/${version}.tar.gz"
+checksum=999b0ef13b798cf04de5451a51201d63a6feaf07c3fdcfbab4e5bca2b4ac653e
+conflicts="python-jmespath>=0"
+
+post_install() {
+	vlicense LICENSE.txt
+}

From e11dd290f7f8db25a7160a86dc6d8a8f2172bcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:17:27 +0700
Subject: [PATCH 024/112] python-Cheroot: drop package

---
 srcpkgs/python-Cheroot/template  | 43 --------------------------------
 srcpkgs/python3-Cheroot          |  1 -
 srcpkgs/python3-Cheroot/template | 29 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/python-Cheroot/template
 delete mode 120000 srcpkgs/python3-Cheroot
 create mode 100644 srcpkgs/python3-Cheroot/template

diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template
deleted file mode 100644
index ce0447f4d35..00000000000
--- a/srcpkgs/python-Cheroot/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-Cheroot'
-pkgname=python-Cheroot
-version=8.3.1
-revision=1
-archs=noarch
-wrksrc="cheroot-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-six python-more-itertools
- python-backports.functools_lru_cache python-jaraco.functools"
-short_desc="High-performance, pure-Python HTTP server (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/cherrypy/cheroot"
-changelog="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz"
-checksum=7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8
-alternatives="cheroot:cheroot:/usr/bin/cheroot2"
-
-pre_build() {
-	vsed -i setup.cfg \
-		-e '/setuptools_scm/d' \
-		-e '/use_scm_version/d' \
-		-e "/name = /a\
-		version = ${version}"
-}
-
-post_install() {
-	vlicense LICENSE.md
-}
-
-python3-Cheroot_package() {
-	archs=noarch
-	depends="python3-setuptools python3-six python3-more-itertools
-	 python3-jaraco.functools"
-	alternatives="cheroot:cheroot:/usr/bin/cheroot3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense LICENSE.md
-	}
-}
diff --git a/srcpkgs/python3-Cheroot b/srcpkgs/python3-Cheroot
deleted file mode 120000
index 46f9f7c6fdc..00000000000
--- a/srcpkgs/python3-Cheroot
+++ /dev/null
@@ -1 +0,0 @@
-python-Cheroot
\ No newline at end of file
diff --git a/srcpkgs/python3-Cheroot/template b/srcpkgs/python3-Cheroot/template
new file mode 100644
index 00000000000..a1f74ef3846
--- /dev/null
+++ b/srcpkgs/python3-Cheroot/template
@@ -0,0 +1,29 @@
+# Template file for 'python3-Cheroot'
+pkgname=python3-Cheroot
+version=8.3.1
+revision=2
+wrksrc="cheroot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-six python3-more-itertools
+ python3-jaraco.functools"
+short_desc="High-performance, pure-Python HTTP server (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/cherrypy/cheroot"
+changelog="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz"
+checksum=7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8
+conflicts="python-Cheroot>=0"
+
+pre_build() {
+	vsed -i setup.cfg \
+		-e '/setuptools_scm/d' \
+		-e '/use_scm_version/d' \
+		-e "/name = /a\
+		version = ${version}"
+}
+
+post_install() {
+	vlicense LICENSE.md
+}

From 8f2bb84c5c5f55235ee689a27264dd6495712188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:17:53 +0700
Subject: [PATCH 025/112] python-jaraco.functools: drop package

---
 srcpkgs/python-jaraco.functools/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-jaraco.functools/template

diff --git a/srcpkgs/python-jaraco.functools/template b/srcpkgs/python-jaraco.functools/template
deleted file mode 100644
index 55c82a8101a..00000000000
--- a/srcpkgs/python-jaraco.functools/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-jaraco.functools'
-pkgname=python-jaraco.functools
-version=2.0
-revision=3
-archs=noarch
-wrksrc="jaraco.functools-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-backports.functools_lru_cache"
-short_desc="Functools like those found in stdlib (Python2)"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://github.com/jaraco/jaraco.functools"
-changelog="https://raw.githubusercontent.com/jaraco/jaraco.functools/${version}/CHANGES.rst"
-distfiles="${PYPI_SITE}/j/jaraco.functools/jaraco.functools-${version}.tar.gz"
-checksum=35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345
-
-post_install() {
-	vlicense LICENSE
-}

From bd5c6a8a1d382f99012af6810a3926ec4b4966f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:18:46 +0700
Subject: [PATCH 026/112] python-isort: drop package

---
 srcpkgs/python-isort/template  | 42 ----------------------------------
 srcpkgs/python3-isort          |  1 -
 srcpkgs/python3-isort/template | 25 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/python-isort/template
 delete mode 120000 srcpkgs/python3-isort
 create mode 100644 srcpkgs/python3-isort/template

diff --git a/srcpkgs/python-isort/template b/srcpkgs/python-isort/template
deleted file mode 100644
index cd8e43b69ea..00000000000
--- a/srcpkgs/python-isort/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-isort'
-pkgname=python-isort
-version=4.3.21
-revision=2
-archs=noarch
-wrksrc="isort-${version}"
-build_style=python-module
-pycompile_module="isort"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-futures"
-checkdepends="python-pytest python3-pytest
- python-backports.functools_lru_cache"
-short_desc="Python2 utility/library to sort imports"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/timothycrosley/isort"
-changelog="https://raw.githubusercontent.com/timothycrosley/isort/master/CHANGELOG.md"
-distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
-checksum=54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1
-alternatives="isort:isort:/usr/bin/isort2"
-
-do_check() {
-	pytest test_isort.py
-	pytest3 test_isort.py
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-isort_package() {
-	archs=noarch
-	pycompile_module="isort"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="isort:isort:/usr/bin/isort3"
-	pkg_install() {
-		vmove usr/bin/isort3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-isort b/srcpkgs/python3-isort
deleted file mode 120000
index 7b803ff7bfe..00000000000
--- a/srcpkgs/python3-isort
+++ /dev/null
@@ -1 +0,0 @@
-python-isort
\ No newline at end of file
diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
new file mode 100644
index 00000000000..801bef84afb
--- /dev/null
+++ b/srcpkgs/python3-isort/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-isort'
+pkgname=python3-isort
+version=4.3.21
+revision=3
+wrksrc="isort-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Python3 utility/library to sort imports"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/timothycrosley/isort"
+changelog="https://raw.githubusercontent.com/timothycrosley/isort/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
+checksum=54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1
+conflicts="python-isort>=0"
+
+do_check() {
+	pytest3 test_isort.py
+}
+
+post_install() {
+	vlicense LICENSE
+}

From c5b1fdb4d8855b4b62aad033910903aa3e42d4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:20:48 +0700
Subject: [PATCH 027/112] python-isbnlib: drop package

---
 srcpkgs/python-isbnlib/template  | 31 -------------------------------
 srcpkgs/python3-isbnlib          |  1 -
 srcpkgs/python3-isbnlib/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-isbnlib/template
 delete mode 120000 srcpkgs/python3-isbnlib
 create mode 100644 srcpkgs/python3-isbnlib/template

diff --git a/srcpkgs/python-isbnlib/template b/srcpkgs/python-isbnlib/template
deleted file mode 100644
index 1cc46a060d6..00000000000
--- a/srcpkgs/python-isbnlib/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-isbnlib'
-pkgname=python-isbnlib
-version=3.9.6
-revision=2
-archs=noarch
-wrksrc="isbnlib-${version}"
-build_style=python-module
-pycompile_module="isbnlib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for ISBN"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="LGPL-3.0-only"
-homepage="https://github.com/xlcnd/isbnlib"
-distfiles="${PYPI_SITE}/i/isbnlib/isbnlib-${version}.tar.gz"
-checksum=d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-isbnlib_package() {
-	archs=noarch
-	pycompile_module="isbnlib"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-isbnlib b/srcpkgs/python3-isbnlib
deleted file mode 120000
index cc5370bdda0..00000000000
--- a/srcpkgs/python3-isbnlib
+++ /dev/null
@@ -1 +0,0 @@
-python-isbnlib
\ No newline at end of file
diff --git a/srcpkgs/python3-isbnlib/template b/srcpkgs/python3-isbnlib/template
new file mode 100644
index 00000000000..3ca66ed74d7
--- /dev/null
+++ b/srcpkgs/python3-isbnlib/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-isbnlib'
+pkgname=python3-isbnlib
+version=3.9.6
+revision=3
+wrksrc="isbnlib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for ISBN"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="LGPL-3.0-only"
+homepage="https://github.com/xlcnd/isbnlib"
+distfiles="${PYPI_SITE}/i/isbnlib/isbnlib-${version}.tar.gz"
+checksum=d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b

From 0af0e8effee0b84f564438d039c27dd0c650d8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:22:09 +0700
Subject: [PATCH 028/112] python-iptools: drop package

---
 srcpkgs/python-iptools/template  | 31 -------------------------------
 srcpkgs/python3-iptools          |  1 -
 srcpkgs/python3-iptools/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-iptools/template
 delete mode 120000 srcpkgs/python3-iptools
 create mode 100644 srcpkgs/python3-iptools/template

diff --git a/srcpkgs/python-iptools/template b/srcpkgs/python-iptools/template
deleted file mode 100644
index 3c53013fb9d..00000000000
--- a/srcpkgs/python-iptools/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-iptools'
-pkgname=python-iptools
-version=0.7.0
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="iptools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 utilites for manipulating IPv4 and IPv6 addresses"
-maintainer="Andrew Mirghassemi <a.mirghassemi@live.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/bd808/python-iptools"
-distfiles="${PYPI_SITE}/i/iptools/iptools-${version}.tar.gz"
-checksum=118a4f638bb5fa0123df56fe3be703b112a689167539bcc194f8698ccdd9e2ea
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-iptools_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="iptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-iptools b/srcpkgs/python3-iptools
deleted file mode 120000
index df602e9b469..00000000000
--- a/srcpkgs/python3-iptools
+++ /dev/null
@@ -1 +0,0 @@
-python-iptools
\ No newline at end of file
diff --git a/srcpkgs/python3-iptools/template b/srcpkgs/python3-iptools/template
new file mode 100644
index 00000000000..9f1107dddb0
--- /dev/null
+++ b/srcpkgs/python3-iptools/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-iptools'
+pkgname=python3-iptools
+version=0.7.0
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 utilites for manipulating IPv4 and IPv6 addresses"
+maintainer="Andrew Mirghassemi <a.mirghassemi@live.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/bd808/python-iptools"
+distfiles="${PYPI_SITE}/i/iptools/iptools-${version}.tar.gz"
+checksum=118a4f638bb5fa0123df56fe3be703b112a689167539bcc194f8698ccdd9e2ea
+
+post_install() {
+	vlicense LICENSE
+}

From 04dc781281fd876c4901264193bab7f57536dfa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:22:58 +0700
Subject: [PATCH 029/112] python-ipaddr: drop package

---
 srcpkgs/python-ipaddr/template | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 srcpkgs/python-ipaddr/template

diff --git a/srcpkgs/python-ipaddr/template b/srcpkgs/python-ipaddr/template
deleted file mode 100644
index 9bd50773ae6..00000000000
--- a/srcpkgs/python-ipaddr/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-ipaddr'
-pkgname=python-ipaddr
-version=2.2.0
-revision=1
-archs=noarch
-wrksrc="ipaddr-${version}"
-build_style=python2-module
-pycompile_module="ipaddr.py"
-hostmakedepends="python"
-makedepends="python-devel"
-short_desc="Python IP address manipulation library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/google/ipaddr-py"
-distfiles="${PYPI_SITE}/i/ipaddr/ipaddr-${version}.tar.gz"
-checksum=4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6

From 35310f0e037c10e06d12695b20a43e4f25528f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:23:30 +0700
Subject: [PATCH 030/112] python-inotify: drop package

---
 srcpkgs/python-inotify/template  | 31 -------------------------------
 srcpkgs/python3-inotify          |  1 -
 srcpkgs/python3-inotify/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-inotify/template
 delete mode 120000 srcpkgs/python3-inotify
 create mode 100644 srcpkgs/python3-inotify/template

diff --git a/srcpkgs/python-inotify/template b/srcpkgs/python-inotify/template
deleted file mode 100644
index 64e48fd9330..00000000000
--- a/srcpkgs/python-inotify/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-inotify'
-pkgname=python-inotify
-version=0.9.6
-revision=4
-archs=noarch
-wrksrc="pyinotify-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="pyinotify.py"
-short_desc="Monitoring filesystems events with inotify on Linux (Python2)"
-homepage="https://github.com/seb-m/pyinotify/"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-distfiles="${PYPI_SITE}/p/pyinotify/pyinotify-${version}.tar.gz"
-checksum=9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4
-
-post_install() {
-	vlicense COPYING
-}
-
-python3-inotify_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="pyinotify.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING
-	}
-}
diff --git a/srcpkgs/python3-inotify b/srcpkgs/python3-inotify
deleted file mode 120000
index cddf3ff670b..00000000000
--- a/srcpkgs/python3-inotify
+++ /dev/null
@@ -1 +0,0 @@
-python-inotify
\ No newline at end of file
diff --git a/srcpkgs/python3-inotify/template b/srcpkgs/python3-inotify/template
new file mode 100644
index 00000000000..f714203427d
--- /dev/null
+++ b/srcpkgs/python3-inotify/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-inotify'
+pkgname=python3-inotify
+version=0.9.6
+revision=5
+wrksrc="pyinotify-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Monitoring filesystems events with inotify on Linux (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/seb-m/pyinotify/"
+distfiles="${PYPI_SITE}/p/pyinotify/pyinotify-${version}.tar.gz"
+checksum=9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4
+
+post_install() {
+	vlicense COPYING
+}

From 25ceddea67b73df06538939a8a4fd9496473b6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:24:09 +0700
Subject: [PATCH 031/112] python-imagesize: drop package

---
 srcpkgs/python-imagesize/template  | 31 ------------------------------
 srcpkgs/python3-imagesize          |  1 -
 srcpkgs/python3-imagesize/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-imagesize/template
 delete mode 120000 srcpkgs/python3-imagesize
 create mode 100644 srcpkgs/python3-imagesize/template

diff --git a/srcpkgs/python-imagesize/template b/srcpkgs/python-imagesize/template
deleted file mode 100644
index f64c86812b5..00000000000
--- a/srcpkgs/python-imagesize/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-imagesize'
-pkgname=python-imagesize
-version=1.1.0
-revision=2
-archs=noarch
-wrksrc="imagesize-${version}"
-build_style=python-module
-pycompile_module="imagesize.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library to get image size from png/jpeg/jpeg2000/gif file"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/shibukawa/imagesize_py"
-license="MIT"
-distfiles="${PYPI_SITE}/i/imagesize/imagesize-${version}.tar.gz"
-checksum=f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5
-
-post_install() {
-	vlicense LICENSE.rst
-}
-
-python3-imagesize_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="imagesize.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-imagesize b/srcpkgs/python3-imagesize
deleted file mode 120000
index ee3a0552dab..00000000000
--- a/srcpkgs/python3-imagesize
+++ /dev/null
@@ -1 +0,0 @@
-python-imagesize
\ No newline at end of file
diff --git a/srcpkgs/python3-imagesize/template b/srcpkgs/python3-imagesize/template
new file mode 100644
index 00000000000..90a8db9fa29
--- /dev/null
+++ b/srcpkgs/python3-imagesize/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-imagesize'
+pkgname=python3-imagesize
+version=1.1.0
+revision=3
+wrksrc="imagesize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library to get image size from png/jpeg/jpeg2000/gif file"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/shibukawa/imagesize_py"
+distfiles="${PYPI_SITE}/i/imagesize/imagesize-${version}.tar.gz"
+checksum=f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5
+
+post_install() {
+	vlicense LICENSE.rst
+}

From 6f2f680971191d3d7a7c18c903d553f01c9e369c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:24:42 +0700
Subject: [PATCH 032/112] python-icalendar: drop package

---
 srcpkgs/python-icalendar/template  | 33 ------------------------------
 srcpkgs/python3-icalendar          |  1 -
 srcpkgs/python3-icalendar/template | 20 ++++++++++++++++++
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-icalendar/template
 delete mode 120000 srcpkgs/python3-icalendar
 create mode 100644 srcpkgs/python3-icalendar/template

diff --git a/srcpkgs/python-icalendar/template b/srcpkgs/python-icalendar/template
deleted file mode 100644
index dbb7ddb8fd3..00000000000
--- a/srcpkgs/python-icalendar/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-icalendar'
-pkgname=python-icalendar
-version=4.0.6
-revision=1
-archs=noarch
-wrksrc="icalendar-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-dateutil python-pytz"
-checkdepends="python3-dateutil python3-pytz python3-pytest python3-hypothesis"
-short_desc="Parser/generator of iCalendar files for use with Python2"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-2-Clause"
-homepage="https://github.com/collective/icalendar"
-distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz"
-checksum=7e6fe7232622abe32d8f54d0936ffcd5a9087198a4c2f1ec1803a7dd9fdd979f
-alternatives="icalendar:icalendar:/usr/bin/icalendar2"
-
-post_install() {
-	vlicense LICENSE.rst LICENSE
-}
-
-python3-icalendar_package() {
-	archs=noarch
-	depends="python3-setuptools python3-dateutil python3-pytz"
-	alternatives="icalendar:icalendar:/usr/bin/icalendar3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst LICENSE
-	}
-}
diff --git a/srcpkgs/python3-icalendar b/srcpkgs/python3-icalendar
deleted file mode 120000
index ac651ba0a62..00000000000
--- a/srcpkgs/python3-icalendar
+++ /dev/null
@@ -1 +0,0 @@
-python-icalendar
\ No newline at end of file
diff --git a/srcpkgs/python3-icalendar/template b/srcpkgs/python3-icalendar/template
new file mode 100644
index 00000000000..8d3514449bf
--- /dev/null
+++ b/srcpkgs/python3-icalendar/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-icalendar'
+pkgname=python3-icalendar
+version=4.0.6
+revision=2
+wrksrc="icalendar-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-dateutil python3-pytz"
+checkdepends="python3-dateutil python3-pytz python3-pytest python3-hypothesis"
+short_desc="Parser/generator of iCalendar files for use with Python3"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-2-Clause"
+homepage="https://github.com/collective/icalendar"
+distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz"
+checksum=7e6fe7232622abe32d8f54d0936ffcd5a9087198a4c2f1ec1803a7dd9fdd979f
+conflicts="python-icalendar>=0"
+
+post_install() {
+	vlicense LICENSE.rst LICENSE
+}

From c7bd5f851150f700ea8056e0952dcbafff48a851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:25:24 +0700
Subject: [PATCH 033/112] python-Flask-Babel: drop package

---
 srcpkgs/python-Flask-Babel/template  | 29 ----------------------------
 srcpkgs/python3-Flask-Babel          |  1 -
 srcpkgs/python3-Flask-Babel/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-Babel/template
 delete mode 120000 srcpkgs/python3-Flask-Babel
 create mode 100644 srcpkgs/python3-Flask-Babel/template

diff --git a/srcpkgs/python-Flask-Babel/template b/srcpkgs/python-Flask-Babel/template
deleted file mode 100644
index e5b600bf922..00000000000
--- a/srcpkgs/python-Flask-Babel/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-Flask-Babel'
-pkgname=python-Flask-Babel
-version=1.0.0
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-Babel python-Jinja2 python-Flask"
-short_desc="Python2 i18n and l10n support for Flask based on Babel and pytz"
-maintainer="pulux <pulux@pf4sh.de>"
-license="BSD-3-Clause"
-homepage="https://pythonhosted.org/Flask-Babel/"
-distfiles="${PYPI_SITE}/F/Flask-Babel/Flask-Babel-${version}.tar.gz"
-checksum=d6a70468f9a8919d59fba2a291a003da3a05ff884275dddbd965f3b98b09ab3e
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-Babel_package() {
-	archs=noarch
-	depends="python3-setuptools python3-Jinja2 python3-Babel python3-Flask"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-Babel b/srcpkgs/python3-Flask-Babel
deleted file mode 120000
index 591168740eb..00000000000
--- a/srcpkgs/python3-Flask-Babel
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-Babel
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-Babel/template b/srcpkgs/python3-Flask-Babel/template
new file mode 100644
index 00000000000..f838af3c735
--- /dev/null
+++ b/srcpkgs/python3-Flask-Babel/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Babel'
+pkgname=python3-Flask-Babel
+version=1.0.0
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-Jinja2 python3-Babel python3-Flask"
+short_desc="Python3 i18n and l10n support for Flask based on Babel and pytz"
+maintainer="pulux <pulux@pf4sh.de>"
+license="BSD-3-Clause"
+homepage="https://pythonhosted.org/Flask-Babel/"
+distfiles="${PYPI_SITE}/F/Flask-Babel/Flask-Babel-${version}.tar.gz"
+checksum=d6a70468f9a8919d59fba2a291a003da3a05ff884275dddbd965f3b98b09ab3e
+
+post_install() {
+	vlicense LICENSE
+}

From dd933c6cf9957833069fb9e9f2ca142409cf187e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:25:40 +0700
Subject: [PATCH 034/112] python-Flask-Login: drop package

---
 srcpkgs/python-Flask-Login/template  | 29 ----------------------------
 srcpkgs/python3-Flask-Login          |  1 -
 srcpkgs/python3-Flask-Login/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-Login/template
 delete mode 120000 srcpkgs/python3-Flask-Login
 create mode 100644 srcpkgs/python3-Flask-Login/template

diff --git a/srcpkgs/python-Flask-Login/template b/srcpkgs/python-Flask-Login/template
deleted file mode 100644
index a9b982bdce6..00000000000
--- a/srcpkgs/python-Flask-Login/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-Flask-Login'
-pkgname=python-Flask-Login
-version=0.5.0
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Flask"
-short_desc="User session management for Flask (Python2)"
-maintainer="pulux <pulux@pf4sh.de>"
-license="MIT"
-homepage="https://github.com/maxcountryman/flask-login"
-distfiles="${PYPI_SITE}/F/Flask-Login/Flask-Login-${version}.tar.gz"
-checksum=6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-Login_package() {
-	archs=noarch
-	depends="python3-Flask"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-Login b/srcpkgs/python3-Flask-Login
deleted file mode 120000
index aacc1d0c164..00000000000
--- a/srcpkgs/python3-Flask-Login
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-Login
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-Login/template b/srcpkgs/python3-Flask-Login/template
new file mode 100644
index 00000000000..ee5d3fc6a61
--- /dev/null
+++ b/srcpkgs/python3-Flask-Login/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Login'
+pkgname=python3-Flask-Login
+version=0.5.0
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Flask"
+short_desc="User session management for Flask (Python3)"
+maintainer="pulux <pulux@pf4sh.de>"
+license="MIT"
+homepage="https://github.com/maxcountryman/flask-login"
+distfiles="${PYPI_SITE}/F/Flask-Login/Flask-Login-${version}.tar.gz"
+checksum=6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b
+
+post_install() {
+	vlicense LICENSE
+}

From 2f21b9586e0cabfbfb7bbf96104d74e067d87f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:26:31 +0700
Subject: [PATCH 035/112] python-Flask-Script: drop package

---
 srcpkgs/python-Flask-Script/template  | 31 ---------------------------
 srcpkgs/python3-Flask-Script          |  1 -
 srcpkgs/python3-Flask-Script/template | 18 ++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-Script/template
 delete mode 120000 srcpkgs/python3-Flask-Script
 create mode 100644 srcpkgs/python3-Flask-Script/template

diff --git a/srcpkgs/python-Flask-Script/template b/srcpkgs/python-Flask-Script/template
deleted file mode 100644
index ebac828a5b1..00000000000
--- a/srcpkgs/python-Flask-Script/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-Flask-Script'
-pkgname=python-Flask-Script
-version=2.0.6
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="flask_script"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Flask"
-short_desc="Scripting support for Flask (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="https://github.com/smurfix/flask-script"
-distfiles="${PYPI_SITE}/F/Flask-Script/Flask-Script-${version}.tar.gz"
-checksum=6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-Script_package() {
-	archs=noarch
-	depends="python3-Flask"
-	pycompile_module="flask_script"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-Script b/srcpkgs/python3-Flask-Script
deleted file mode 120000
index 9fe2b37813b..00000000000
--- a/srcpkgs/python3-Flask-Script
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-Script
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-Script/template b/srcpkgs/python3-Flask-Script/template
new file mode 100644
index 00000000000..692d682da6a
--- /dev/null
+++ b/srcpkgs/python3-Flask-Script/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Script'
+pkgname=python3-Flask-Script
+version=2.0.6
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Flask"
+short_desc="Scripting support for Flask (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/smurfix/flask-script"
+distfiles="${PYPI_SITE}/F/Flask-Script/Flask-Script-${version}.tar.gz"
+checksum=6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65
+
+post_install() {
+	vlicense LICENSE
+}

From 269bbaf70da35286df7e4e0dff0acf96cd6d26c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:26:52 +0700
Subject: [PATCH 036/112] python-Flask-WTF: drop package

---
 srcpkgs/python-Flask-WTF/template  | 29 -----------------------------
 srcpkgs/python3-Flask-WTF          |  1 -
 srcpkgs/python3-Flask-WTF/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-WTF/template
 delete mode 120000 srcpkgs/python3-Flask-WTF
 create mode 100644 srcpkgs/python3-Flask-WTF/template

diff --git a/srcpkgs/python-Flask-WTF/template b/srcpkgs/python-Flask-WTF/template
deleted file mode 100644
index f72307f79be..00000000000
--- a/srcpkgs/python-Flask-WTF/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-Flask-WTF'
-pkgname=python-Flask-WTF
-version=0.14.3
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Flask python-WTForms"
-short_desc="Simple integration of Flask and WTForms (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/lepture/flask-wtf"
-distfiles="${PYPI_SITE}/F/Flask-WTF/Flask-WTF-${version}.tar.gz"
-checksum=d417e3a0008b5ba583da1763e4db0f55a1269d9dd91dcc3eb3c026d3c5dbd720
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-WTF_package() {
-	archs=noarch
-	depends="python3-Flask python3-WTForms"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-WTF b/srcpkgs/python3-Flask-WTF
deleted file mode 120000
index d9346f045fd..00000000000
--- a/srcpkgs/python3-Flask-WTF
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-WTF
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-WTF/template b/srcpkgs/python3-Flask-WTF/template
new file mode 100644
index 00000000000..4ab989ca651
--- /dev/null
+++ b/srcpkgs/python3-Flask-WTF/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-WTF'
+pkgname=python3-Flask-WTF
+version=0.14.3
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Flask python3-WTForms"
+short_desc="Simple integration of Flask and WTForms (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/lepture/flask-wtf"
+distfiles="${PYPI_SITE}/F/Flask-WTF/Flask-WTF-${version}.tar.gz"
+checksum=d417e3a0008b5ba583da1763e4db0f55a1269d9dd91dcc3eb3c026d3c5dbd720
+
+post_install() {
+	vlicense LICENSE
+}

From b5b5e9c05af9e0c289ddb92af1c6b38abe0e7166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:27:29 +0700
Subject: [PATCH 037/112] python-Flask: drop package

---
 srcpkgs/python-Flask/template  | 34 ----------------------------------
 srcpkgs/python3-Flask          |  1 -
 srcpkgs/python3-Flask/template | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-Flask/template
 delete mode 120000 srcpkgs/python3-Flask
 create mode 100644 srcpkgs/python3-Flask/template

diff --git a/srcpkgs/python-Flask/template b/srcpkgs/python-Flask/template
deleted file mode 100644
index 1aa7f5208ed..00000000000
--- a/srcpkgs/python-Flask/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-Flask'
-pkgname=python-Flask
-version=1.1.2
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-Jinja2 python-Werkzeug python-itsdangerous python-click"
-checkdepends="${depends} python-pytest python-hypothesis
- python3-pytest python3-hypothesis"
-short_desc="Python2 web microframework"
-maintainer="Markus Berger <pulux@pf4sh.de>"
-license="BSD-3-Clause"
-homepage="http://flask.pocoo.org"
-distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz"
-checksum=4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060
-alternatives="flask:flask:/usr/bin/flask2"
-
-post_install() {
-	vlicense LICENSE.rst
-}
-
-python3-Flask_package() {
-	archs=noarch
-	depends="python3-setuptools python3-Jinja2 python3-Werkzeug python3-itsdangerous python3-click"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="flask:flask:/usr/bin/flask3"
-	pkg_install() {
-		vmove usr/bin/flask3
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-Flask b/srcpkgs/python3-Flask
deleted file mode 120000
index 491c9a5f443..00000000000
--- a/srcpkgs/python3-Flask
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask/template b/srcpkgs/python3-Flask/template
new file mode 100644
index 00000000000..b90a920b546
--- /dev/null
+++ b/srcpkgs/python3-Flask/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-Flask'
+pkgname=python3-Flask
+version=1.1.2
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-Jinja2 python3-Werkzeug
+ python3-itsdangerous python3-click"
+checkdepends="${depends}
+python3-pytest python3-hypothesis"
+short_desc="Python3 web microframework"
+maintainer="Markus Berger <pulux@pf4sh.de>"
+license="BSD-3-Clause"
+homepage="http://flask.pocoo.org"
+distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz"
+checksum=4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060
+conflicts="python-Flask>=0"
+
+post_install() {
+	vlicense LICENSE.rst
+}

From 401a250c3a800d24d3cc14cb5422ba4c82762e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:27:51 +0700
Subject: [PATCH 038/112] python-Werkzeug: drop package

---
 srcpkgs/python-Werkzeug/template  | 31 -------------------------------
 srcpkgs/python3-Werkzeug          |  1 -
 srcpkgs/python3-Werkzeug/template | 20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-Werkzeug/template
 delete mode 120000 srcpkgs/python3-Werkzeug
 create mode 100644 srcpkgs/python3-Werkzeug/template

diff --git a/srcpkgs/python-Werkzeug/template b/srcpkgs/python-Werkzeug/template
deleted file mode 100644
index b4bf1071851..00000000000
--- a/srcpkgs/python-Werkzeug/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-Werkzeug'
-pkgname=python-Werkzeug
-version=1.0.1
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python-pytest python-hypothesis python-requests
- python3-pytest python3-hypothesis python3-requests"
-short_desc="Swiss Army knife of Python web development (Python2)"
-maintainer="Markus Berger <pulux@pf4sh.de>"
-license="BSD-3-Clause"
-homepage="https://palletsprojects.com/p/werkzeug/"
-distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
-checksum=6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c
-
-post_install() {
-	vlicense LICENSE.rst
-}
-
-python3-Werkzeug_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-Werkzeug b/srcpkgs/python3-Werkzeug
deleted file mode 120000
index 3a0fb848426..00000000000
--- a/srcpkgs/python3-Werkzeug
+++ /dev/null
@@ -1 +0,0 @@
-python-Werkzeug
\ No newline at end of file
diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
new file mode 100644
index 00000000000..d0722e9d93b
--- /dev/null
+++ b/srcpkgs/python3-Werkzeug/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-Werkzeug'
+pkgname=python3-Werkzeug
+version=1.0.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="
+python3-pytest python3-hypothesis python3-requests"
+short_desc="Swiss Army knife of Python web development (Python3)"
+maintainer="Markus Berger <pulux@pf4sh.de>"
+license="BSD-3-Clause"
+homepage="https://palletsprojects.com/p/werkzeug/"
+distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
+checksum=6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c
+
+post_install() {
+	vlicense LICENSE.rst
+}

From bdef994456f9a8238b9c53d6e8dafa109b8181ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:28:42 +0700
Subject: [PATCH 039/112] python-hyper-h2: drop package

---
 srcpkgs/python-hyper-h2/template  | 28 ----------------------------
 srcpkgs/python3-hyper-h2          |  1 -
 srcpkgs/python3-hyper-h2/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/python-hyper-h2/template
 delete mode 120000 srcpkgs/python3-hyper-h2
 create mode 100644 srcpkgs/python3-hyper-h2/template

diff --git a/srcpkgs/python-hyper-h2/template b/srcpkgs/python-hyper-h2/template
deleted file mode 100644
index eb29959d45b..00000000000
--- a/srcpkgs/python-hyper-h2/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-hyper-h2'
-pkgname=python-hyper-h2
-version=3.2.0
-revision=1
-archs=noarch
-wrksrc="hyper-h2-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-hpack python-hyperframe"
-short_desc="HTTP/2 State-Machine based protocol implementation(Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyper-h2"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ef4213b73e113905c67fdc0abd677c6e2dff53894e657fbc12987ae5c00b6c91
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-hyper-h2_package() {
-	archs=noarch
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3 python3-hpack python3-hyperframe"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-hyper-h2 b/srcpkgs/python3-hyper-h2
deleted file mode 120000
index 3e2cb726599..00000000000
--- a/srcpkgs/python3-hyper-h2
+++ /dev/null
@@ -1 +0,0 @@
-python-hyper-h2
\ No newline at end of file
diff --git a/srcpkgs/python3-hyper-h2/template b/srcpkgs/python3-hyper-h2/template
new file mode 100644
index 00000000000..bf56f8bc69d
--- /dev/null
+++ b/srcpkgs/python3-hyper-h2/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hyper-h2'
+pkgname=python3-hyper-h2
+version=3.2.0
+revision=2
+wrksrc="hyper-h2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-hpack python3-hyperframe"
+short_desc="HTTP/2 State-Machine based protocol implementation(Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/python-hyper/hyper-h2"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ef4213b73e113905c67fdc0abd677c6e2dff53894e657fbc12987ae5c00b6c91
+
+post_install() {
+	vlicense LICENSE
+}

From 36592d83cc6174fd08ed07baa7f17e4643831ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:29:07 +0700
Subject: [PATCH 040/112] python-hyperframe: drop package

---
 srcpkgs/python-hyperframe/template  | 30 -----------------------------
 srcpkgs/python3-hyperframe          |  1 -
 srcpkgs/python3-hyperframe/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-hyperframe/template
 delete mode 120000 srcpkgs/python3-hyperframe
 create mode 100644 srcpkgs/python3-hyperframe/template

diff --git a/srcpkgs/python-hyperframe/template b/srcpkgs/python-hyperframe/template
deleted file mode 100644
index 6b544c2061c..00000000000
--- a/srcpkgs/python-hyperframe/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-hyperframe'
-pkgname=python-hyperframe
-version=5.2.0
-revision=2
-archs=noarch
-wrksrc=hyperframe-${version}
-build_style=python-module
-pycompile_module="hyperframe"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python HTTP/2 framing (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://python-hyper.org/hyperframe/"
-distfiles="https://github.com/python-hyper/hyperframe/archive/v${version}.tar.gz"
-checksum=cd69754e1a7dc16ac5b9c128ffcbb54b7598853bd54ed24a94df29a58eb541ec
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-hyperframe_package() {
-	archs=noarch
-	pycompile_module="hyperframe"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-hyperframe b/srcpkgs/python3-hyperframe
deleted file mode 120000
index 6a9d1016f10..00000000000
--- a/srcpkgs/python3-hyperframe
+++ /dev/null
@@ -1 +0,0 @@
-python-hyperframe
\ No newline at end of file
diff --git a/srcpkgs/python3-hyperframe/template b/srcpkgs/python3-hyperframe/template
new file mode 100644
index 00000000000..edae28f1acb
--- /dev/null
+++ b/srcpkgs/python3-hyperframe/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hyperframe'
+pkgname=python3-hyperframe
+version=5.2.0
+revision=3
+wrksrc=hyperframe-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python HTTP/2 framing (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://python-hyper.org/hyperframe/"
+distfiles="https://github.com/python-hyper/hyperframe/archive/v${version}.tar.gz"
+checksum=cd69754e1a7dc16ac5b9c128ffcbb54b7598853bd54ed24a94df29a58eb541ec
+
+post_install() {
+	vlicense LICENSE
+}

From 00ac34420478be2654ee21348ecab5634f7357f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:29:54 +0700
Subject: [PATCH 041/112] python-httplib2: drop package

---
 srcpkgs/python3-httplib2                      |  1 -
 .../template                                  | 27 ++++++-------------
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/python3-httplib2
 rename srcpkgs/{python-httplib2 => python3-httplib2}/template (60%)

diff --git a/srcpkgs/python3-httplib2 b/srcpkgs/python3-httplib2
deleted file mode 120000
index a9367265aad..00000000000
--- a/srcpkgs/python3-httplib2
+++ /dev/null
@@ -1 +0,0 @@
-python-httplib2
\ No newline at end of file
diff --git a/srcpkgs/python-httplib2/template b/srcpkgs/python3-httplib2/template
similarity index 60%
rename from srcpkgs/python-httplib2/template
rename to srcpkgs/python3-httplib2/template
index 3a31c396621..de7bdb42255 100644
--- a/srcpkgs/python-httplib2/template
+++ b/srcpkgs/python3-httplib2/template
@@ -1,15 +1,14 @@
-# Template file for 'python-httplib2'
-pkgname=python-httplib2
+# Template file for 'python3-httplib2'
+pkgname=python3-httplib2
 version=0.14.0
-revision=3
-archs=noarch
+revision=4
 create_wrksrc=yes
 build_wrksrc="httplib2-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python ca-certificates"
-short_desc="Comprehensive HTTP client library (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 ca-certificates"
+short_desc="Comprehensive HTTP client library (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/httplib2/httplib2"
 changelog="https://raw.githubusercontent.com/httplib2/httplib2/master/CHANGELOG"
@@ -27,13 +26,3 @@ post_install() {
 
 	vlicense ../LICENSE.txt
 }
-
-python3-httplib2_package() {
-	archs=noarch
-	depends="python3 ca-certificates"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense ../LICENSE.txt
-	}
-}

From d3bc1350451803a50269e0fbcc55e3d43c0c6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:31:11 +0700
Subject: [PATCH 042/112] python-gitlab: drop package

---
 srcpkgs/python-gitlab/template  | 34 ---------------------------------
 srcpkgs/python3-gitlab          |  1 -
 srcpkgs/python3-gitlab/template | 21 ++++++++++++++++++++
 3 files changed, 21 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-gitlab/template
 delete mode 120000 srcpkgs/python3-gitlab
 create mode 100644 srcpkgs/python3-gitlab/template

diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template
deleted file mode 100644
index 0f71b4c7153..00000000000
--- a/srcpkgs/python-gitlab/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-gitlab'
-pkgname=python-gitlab
-version=1.12.1
-revision=2
-archs=noarch
-build_style=python-module
-pycompile_module="gitlab"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-requests python-six"
-checkdepends="${depends} python-httmock python-mock"
-short_desc="Wrapper for GitLab's API (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/gpocentek/python-gitlab"
-changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
-distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
-checksum=984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec
-alternatives="python-gitlab:gitlab:/usr/bin/gitlab2"
-
-do_check() {
-	python2 setup.py test
-}
-
-python3-gitlab_package() {
-	archs=noarch
-	depends="python3-setuptools python3-requests python3-six"
-	pycompile_module="gitlab"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="python-gitlab:gitlab:/usr/bin/gitlab3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-gitlab b/srcpkgs/python3-gitlab
deleted file mode 120000
index 67de9d9568d..00000000000
--- a/srcpkgs/python3-gitlab
+++ /dev/null
@@ -1 +0,0 @@
-python-gitlab
\ No newline at end of file
diff --git a/srcpkgs/python3-gitlab/template b/srcpkgs/python3-gitlab/template
new file mode 100644
index 00000000000..5c0080bc92a
--- /dev/null
+++ b/srcpkgs/python3-gitlab/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-gitlab'
+pkgname=python3-gitlab
+version=1.12.1
+revision=3
+wrksrc=python-gitlab-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-requests python3-six"
+checkdepends="${depends}"
+short_desc="Wrapper for GitLab's API (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/gpocentek/python-gitlab"
+changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
+distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
+checksum=984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec
+conflicts="python-gitlab>=0"
+
+do_check() {
+	python2 setup.py test
+}

From 82bfecd94b94a79904adefc942eeaeb8c512e6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:31:23 +0700
Subject: [PATCH 043/112] python-httmock: drop package

---
 srcpkgs/python-httmock/template  | 31 -------------------------------
 srcpkgs/python3-httmock          |  1 -
 srcpkgs/python3-httmock/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-httmock/template
 delete mode 120000 srcpkgs/python3-httmock
 create mode 100644 srcpkgs/python3-httmock/template

diff --git a/srcpkgs/python-httmock/template b/srcpkgs/python-httmock/template
deleted file mode 100644
index e798b4fc1b3..00000000000
--- a/srcpkgs/python-httmock/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-httmock'
-pkgname=python-httmock
-version=1.3.0
-revision=2
-archs=noarch
-wrksrc="httmock-${version}"
-build_style=python-module
-pycompile_module="httmock.py"
-hostmakedepends="python3-setuptools python-setuptools"
-depends="python-requests"
-checkdepends="python3-requests"
-short_desc="Mocking library for requests (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/patrys/httmock"
-distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
-checksum=4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
-
-do_check() {
-	python3 setup.py test
-}
-
-python3-httmock_package() {
-	archs=noarch
-	pycompile_module="httmock.py"
-	depends="python3-requests"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-httmock b/srcpkgs/python3-httmock
deleted file mode 120000
index cb20ded1289..00000000000
--- a/srcpkgs/python3-httmock
+++ /dev/null
@@ -1 +0,0 @@
-python-httmock
\ No newline at end of file
diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template
new file mode 100644
index 00000000000..7c8195dd3f8
--- /dev/null
+++ b/srcpkgs/python3-httmock/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-httmock'
+pkgname=python3-httmock
+version=1.3.0
+revision=3
+wrksrc="httmock-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests"
+checkdepends="python3-requests"
+short_desc="Mocking library for requests (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/patrys/httmock"
+distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
+checksum=4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
+
+do_check() {
+	python3 setup.py test
+}

From 6fb2012c313765dbb1adbd9eb767b540a6ab6910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:31:55 +0700
Subject: [PATCH 044/112] python-hpack: drop package

---
 srcpkgs/python-hpack/template  | 30 ------------------------------
 srcpkgs/python3-hpack          |  1 -
 srcpkgs/python3-hpack/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-hpack/template
 delete mode 120000 srcpkgs/python3-hpack
 create mode 100644 srcpkgs/python3-hpack/template

diff --git a/srcpkgs/python-hpack/template b/srcpkgs/python-hpack/template
deleted file mode 100644
index ffbac313103..00000000000
--- a/srcpkgs/python-hpack/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-hpack'
-pkgname=python-hpack
-version=3.0.0
-revision=2
-archs=noarch
-wrksrc=hpack-${version}
-build_style=python-module
-pycompile_module="hpack"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="HTTP/2 Header Encoding (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://python-hyper.org/hpack/"
-distfiles="https://github.com/python-hyper/hpack/archive/v${version}.tar.gz"
-checksum=0f8f5f92cfa59f91804eabb237d4b18895f3e200e282c41cedf6cd11a4416daa
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-hpack_package() {
-	archs=noarch
-	pycompile_module="hpack"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-hpack b/srcpkgs/python3-hpack
deleted file mode 120000
index 4d4e7a11154..00000000000
--- a/srcpkgs/python3-hpack
+++ /dev/null
@@ -1 +0,0 @@
-python-hpack
\ No newline at end of file
diff --git a/srcpkgs/python3-hpack/template b/srcpkgs/python3-hpack/template
new file mode 100644
index 00000000000..7eb9889b862
--- /dev/null
+++ b/srcpkgs/python3-hpack/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hpack'
+pkgname=python3-hpack
+version=3.0.0
+revision=3
+wrksrc=hpack-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="HTTP/2 Header Encoding (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://python-hyper.org/hpack/"
+distfiles="https://github.com/python-hyper/hpack/archive/v${version}.tar.gz"
+checksum=0f8f5f92cfa59f91804eabb237d4b18895f3e200e282c41cedf6cd11a4416daa
+
+post_install() {
+	vlicense LICENSE
+}

From 7a069235ae77aeaeb7b035aeb083a9ae7d7084f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:32:22 +0700
Subject: [PATCH 045/112] python-habanero: drop package

---
 srcpkgs/python-habanero/template  | 31 -------------------------------
 srcpkgs/python3-habanero          |  1 -
 srcpkgs/python3-habanero/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-habanero/template
 delete mode 120000 srcpkgs/python3-habanero
 create mode 100644 srcpkgs/python3-habanero/template

diff --git a/srcpkgs/python-habanero/template b/srcpkgs/python-habanero/template
deleted file mode 100644
index a914f21ecb7..00000000000
--- a/srcpkgs/python-habanero/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-habanero'
-pkgname=python-habanero
-version=0.6.2
-revision=2
-archs=noarch
-wrksrc="habanero-${version}"
-build_style=python-module
-pycompile_module="habanero"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-requests"
-short_desc="Python2 low level client for Crossref Search API"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="MIT"
-homepage="https://github.com/sckott/habanero"
-distfiles="${PYPI_SITE}/h/habanero/habanero-${version}.tar.gz"
-checksum=806c74298e0fb8a838514307ef3eca73685a968b8efd00e5dfe1ea604200f59d
-
-post_install() {
-	vlicense docs/license.rst
-}
-
-python3-habanero_package() {
-	archs=noarch
-	pycompile_module="habanero"
-	depends="python3-requests"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense docs/license.rst
-	}
-}
diff --git a/srcpkgs/python3-habanero b/srcpkgs/python3-habanero
deleted file mode 120000
index 947f4479622..00000000000
--- a/srcpkgs/python3-habanero
+++ /dev/null
@@ -1 +0,0 @@
-python-habanero
\ No newline at end of file
diff --git a/srcpkgs/python3-habanero/template b/srcpkgs/python3-habanero/template
new file mode 100644
index 00000000000..b0b6d938a27
--- /dev/null
+++ b/srcpkgs/python3-habanero/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-habanero'
+pkgname=python3-habanero
+version=0.6.2
+revision=3
+wrksrc="habanero-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests"
+short_desc="Python3 low level client for Crossref Search API"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="MIT"
+homepage="https://github.com/sckott/habanero"
+distfiles="${PYPI_SITE}/h/habanero/habanero-${version}.tar.gz"
+checksum=806c74298e0fb8a838514307ef3eca73685a968b8efd00e5dfe1ea604200f59d
+
+post_install() {
+	vlicense docs/license.rst
+}

From 2e429c5c755bbcf3ce51ae8c7923ca3b883c0933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:32:37 +0700
Subject: [PATCH 046/112] python-h11: drop package

---
 srcpkgs/python-h11/template  | 30 ------------------------------
 srcpkgs/python3-h11          |  1 -
 srcpkgs/python3-h11/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-h11/template
 delete mode 120000 srcpkgs/python3-h11
 create mode 100644 srcpkgs/python3-h11/template

diff --git a/srcpkgs/python-h11/template b/srcpkgs/python-h11/template
deleted file mode 100644
index 7f2d2c5fa8a..00000000000
--- a/srcpkgs/python-h11/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-h11'
-pkgname=python-h11
-version=0.9.0
-revision=2
-archs=noarch
-wrksrc=h11-${version}
-build_style=python-module
-pycompile_module="h11"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Bring-your-own-I/O implementation of HTTP/1.1 (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://github.com/python-hyper/h11"
-distfiles="https://github.com/python-hyper/h11/archive/v${version}.tar.gz"
-checksum=77b543bed05fb7b1e267dc8552d502b6f9f69d3812c8d58d0a56d0f148d2ae06
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-h11_package() {
-	archs=noarch
-	pycompile_module="h11"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-h11 b/srcpkgs/python3-h11
deleted file mode 120000
index d3c0773985b..00000000000
--- a/srcpkgs/python3-h11
+++ /dev/null
@@ -1 +0,0 @@
-python-h11
\ No newline at end of file
diff --git a/srcpkgs/python3-h11/template b/srcpkgs/python3-h11/template
new file mode 100644
index 00000000000..99ec82f0099
--- /dev/null
+++ b/srcpkgs/python3-h11/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-h11'
+pkgname=python3-h11
+version=0.9.0
+revision=3
+wrksrc=h11-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Bring-your-own-I/O implementation of HTTP/1.1 (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/python-hyper/h11"
+distfiles="https://github.com/python-hyper/h11/archive/v${version}.tar.gz"
+checksum=77b543bed05fb7b1e267dc8552d502b6f9f69d3812c8d58d0a56d0f148d2ae06
+
+post_install() {
+	vlicense LICENSE.txt
+}

From b5be6f7e630814df2dbc28ae508f17e8e24219c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:33:00 +0700
Subject: [PATCH 047/112] python-gogs-client: drop package

---
 srcpkgs/python-gogs-client/template  | 33 ----------------------------
 srcpkgs/python3-gogs-client          |  1 -
 srcpkgs/python3-gogs-client/template | 20 +++++++++++++++++
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-gogs-client/template
 delete mode 120000 srcpkgs/python3-gogs-client
 create mode 100644 srcpkgs/python3-gogs-client/template

diff --git a/srcpkgs/python-gogs-client/template b/srcpkgs/python-gogs-client/template
deleted file mode 100644
index 027135d430c..00000000000
--- a/srcpkgs/python-gogs-client/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-gogs-client'
-pkgname=python-gogs-client
-version=1.0.6
-revision=4
-archs=noarch
-wrksrc="gogs_client-${version}"
-build_style=python-module
-pycompile_module="gogs_client"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-future python-requests python-attrs"
-short_desc="Python2 library for interacting with a gogs server"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-homepage="https://github.com/unfoldingWord-dev/python-gogs-client"
-license="MIT"
-distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz"
-checksum=4bd585ff86f6d70a245cea3b9b9756205bdaa9f512b314c47f715842970b3d3f
-
-post_install() {
-	vlicense LICENSE.txt
-	# remove tests directory polluting site-packages
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests
-}
-
-python3-gogs-client_package() {
-	archs=noarch
-	depends="python3-future python3-requests python3-attrs"
-	pycompile_module="gogs_client"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-gogs-client b/srcpkgs/python3-gogs-client
deleted file mode 120000
index 24a119bfc28..00000000000
--- a/srcpkgs/python3-gogs-client
+++ /dev/null
@@ -1 +0,0 @@
-python-gogs-client
\ No newline at end of file
diff --git a/srcpkgs/python3-gogs-client/template b/srcpkgs/python3-gogs-client/template
new file mode 100644
index 00000000000..ce29cc9dced
--- /dev/null
+++ b/srcpkgs/python3-gogs-client/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-gogs-client'
+pkgname=python3-gogs-client
+version=1.0.6
+revision=5
+wrksrc="gogs_client-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-future python3-requests python3-attrs"
+short_desc="Python3 library for interacting with a gogs server"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="MIT"
+homepage="https://github.com/unfoldingWord-dev/python-gogs-client"
+distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz"
+checksum=4bd585ff86f6d70a245cea3b9b9756205bdaa9f512b314c47f715842970b3d3f
+
+post_install() {
+	vlicense LICENSE.txt
+	# remove tests directory polluting site-packages
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests
+}

From bae64baf458c3b6a0f7376799cf97e5db269b570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:33:19 +0700
Subject: [PATCH 048/112] python-gnupg: drop package

---
 srcpkgs/python-gnupg/template                 | 28 -------------------
 srcpkgs/python3-gnupg                         |  1 -
 srcpkgs/python3-gnupg/template                | 19 +++++++++++++
 .../{python-gnupg => python3-gnupg}/update    |  0
 srcpkgs/python3-httplib2/template             |  6 ++--
 5 files changed, 21 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-gnupg/template
 delete mode 120000 srcpkgs/python3-gnupg
 create mode 100644 srcpkgs/python3-gnupg/template
 rename srcpkgs/{python-gnupg => python3-gnupg}/update (100%)

diff --git a/srcpkgs/python-gnupg/template b/srcpkgs/python-gnupg/template
deleted file mode 100644
index b5dd94bf8e1..00000000000
--- a/srcpkgs/python-gnupg/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-gnupg'
-pkgname=python-gnupg
-version=0.4.6
-revision=1
-archs=noarch
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python gnupg"
-short_desc="Python2 wrapper for GnuPG"
-maintainer="Lon Willett <xgit@lonw.net>"
-license="BSD-3-Clause"
-homepage="https://bitbucket.org/vinay.sajip/python-gnupg"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-gnupg_package() {
-	depends="python3 gnupg"
-	short_desc="${short_desc/Python2/Python3}"
-	archs=noarch
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-gnupg b/srcpkgs/python3-gnupg
deleted file mode 120000
index 03e85363c37..00000000000
--- a/srcpkgs/python3-gnupg
+++ /dev/null
@@ -1 +0,0 @@
-python-gnupg
\ No newline at end of file
diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
new file mode 100644
index 00000000000..fcd1fffc9f8
--- /dev/null
+++ b/srcpkgs/python3-gnupg/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-gnupg'
+pkgname=python3-gnupg
+_pkgname=python-gnupg
+version=0.4.6
+revision=2
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 gnupg"
+short_desc="Python3 wrapper for GnuPG"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="BSD-3-Clause"
+homepage="https://bitbucket.org/vinay.sajip/python-gnupg"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-gnupg/update b/srcpkgs/python3-gnupg/update
similarity index 100%
rename from srcpkgs/python-gnupg/update
rename to srcpkgs/python3-gnupg/update
diff --git a/srcpkgs/python3-httplib2/template b/srcpkgs/python3-httplib2/template
index de7bdb42255..eefec628859 100644
--- a/srcpkgs/python3-httplib2/template
+++ b/srcpkgs/python3-httplib2/template
@@ -19,10 +19,8 @@ checksum="34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107
 
 post_install() {
 	# use system ca certificates
-	for py_sitelib in $py2_sitelib $py3_sitelib; do
-		rm -rf ${DESTDIR}/${py_sitelib}/httplib2/cacerts.txt
-		ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py_sitelib}/httplib2/cacerts.txt
-	done
+	rm -rf ${DESTDIR}/${py3_sitelib}/httplib2/cacerts.txt
+	ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py3_sitelib}/httplib2/cacerts.txt
 
 	vlicense ../LICENSE.txt
 }

From 2b74bdf353b5bcfdcc5d39e72c548eb307450e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:34:16 +0700
Subject: [PATCH 049/112] python-github3: drop package

---
 srcpkgs/python-github3/template               | 32 -------------------
 srcpkgs/python3-github3                       |  1 -
 srcpkgs/python3-github3/template              | 19 +++++++++++
 .../update                                    |  0
 4 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-github3/template
 delete mode 120000 srcpkgs/python3-github3
 create mode 100644 srcpkgs/python3-github3/template
 rename srcpkgs/{python-github3 => python3-github3}/update (100%)

diff --git a/srcpkgs/python-github3/template b/srcpkgs/python-github3/template
deleted file mode 100644
index 425fe1b7362..00000000000
--- a/srcpkgs/python-github3/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-github3'
-pkgname=python-github3
-version=1.3.0
-revision=2
-archs=noarch
-wrksrc="github3.py-${version}"
-build_style=python-module
-pycompile_module="github3"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-requests python-uritemplate"
-short_desc="Wrapper for GitHub's API (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="BSD-3-Clause"
-homepage="https://github3py.readthedocs.org"
-changelog="https://raw.githubusercontent.com/sigmavirus24/github3.py/master/docs/source/release-notes/${version}.rst"
-distfiles="${PYPI_SITE}/g/github3.py/github3.py-${version}.tar.gz"
-checksum=15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-github3_package() {
-	archs=noarch
-	depends="python3-requests python3-uritemplate"
-	pycompile_module="github3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-github3 b/srcpkgs/python3-github3
deleted file mode 120000
index 7a5d11df803..00000000000
--- a/srcpkgs/python3-github3
+++ /dev/null
@@ -1 +0,0 @@
-python-github3
\ No newline at end of file
diff --git a/srcpkgs/python3-github3/template b/srcpkgs/python3-github3/template
new file mode 100644
index 00000000000..8873ca5f760
--- /dev/null
+++ b/srcpkgs/python3-github3/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-github3'
+pkgname=python3-github3
+version=1.3.0
+revision=3
+wrksrc="github3.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-uritemplate"
+short_desc="Wrapper for GitHub's API (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="BSD-3-Clause"
+homepage="https://github3py.readthedocs.org"
+changelog="https://raw.githubusercontent.com/sigmavirus24/github3.py/master/docs/source/release-notes/${version}.rst"
+distfiles="${PYPI_SITE}/g/github3.py/github3.py-${version}.tar.gz"
+checksum=15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-github3/update b/srcpkgs/python3-github3/update
similarity index 100%
rename from srcpkgs/python-github3/update
rename to srcpkgs/python3-github3/update

From 958b033ae3ccf8116443da780a5228e93c5eb783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:34:56 +0700
Subject: [PATCH 050/112] python-click-threading: drop package

---
 srcpkgs/python-click-threading/template  | 31 ------------------------
 srcpkgs/python3-click-threading          |  1 -
 srcpkgs/python3-click-threading/template | 18 ++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-click-threading/template
 delete mode 120000 srcpkgs/python3-click-threading
 create mode 100644 srcpkgs/python3-click-threading/template

diff --git a/srcpkgs/python-click-threading/template b/srcpkgs/python-click-threading/template
deleted file mode 100644
index 49b4a4a9aae..00000000000
--- a/srcpkgs/python-click-threading/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-click-threading'
-pkgname=python-click-threading
-version=0.4.4
-revision=2
-archs=noarch
-wrksrc="click-threading-${version}"
-build_style="python-module"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-click python-futures"
-pycompile_module="click_threading"
-short_desc="Multithreaded Click apps made easy (Python2)"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="MIT"
-homepage="https://github.com/click-contrib/click-threading"
-distfiles="${PYPI_SITE}/c/click-threading/click-threading-${version}.tar.gz"
-checksum=b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-click-threading_package() {
-	archs=noarch
-	pycompile_module="click_threading"
-	depends="python3-click"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-click-threading b/srcpkgs/python3-click-threading
deleted file mode 120000
index 5bfcef2e127..00000000000
--- a/srcpkgs/python3-click-threading
+++ /dev/null
@@ -1 +0,0 @@
-python-click-threading
\ No newline at end of file
diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
new file mode 100644
index 00000000000..56928810364
--- /dev/null
+++ b/srcpkgs/python3-click-threading/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click-threading'
+pkgname=python3-click-threading
+version=0.4.4
+revision=3
+wrksrc="click-threading-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3-click"
+short_desc="Multithreaded Click apps made easy (Python3)"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-threading"
+distfiles="${PYPI_SITE}/c/click-threading/click-threading-${version}.tar.gz"
+checksum=b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7
+
+post_install() {
+	vlicense LICENSE
+}

From a772ac65a236fe331134633f2cbfb177373ee74a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:35:10 +0700
Subject: [PATCH 051/112] python-futures: drop package

---
 srcpkgs/python-futures/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-futures/template

diff --git a/srcpkgs/python-futures/template b/srcpkgs/python-futures/template
deleted file mode 100644
index 12d1f4ae71f..00000000000
--- a/srcpkgs/python-futures/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-futures'
-pkgname=python-futures
-version=3.2.0
-revision=1
-archs=noarch
-wrksrc="futures-${version}"
-build_style=python2-module
-pycompile_module="concurrent"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the concurrent.futures package from Python 3.2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="PSF"
-homepage="https://github.com/agronholm/pythonfutures"
-distfiles="${PYPI_SITE}/f/futures/futures-${version}.tar.gz"
-checksum=9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265
-
-post_install() {
-	vlicense LICENSE
-}

From 9386d777962ffee9dcf7a039ef40425ff0d2cbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:35:41 +0700
Subject: [PATCH 052/112] python-functools32: drop package

---
 srcpkgs/python-functools32/template | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 srcpkgs/python-functools32/template

diff --git a/srcpkgs/python-functools32/template b/srcpkgs/python-functools32/template
deleted file mode 100644
index 53f9d69a576..00000000000
--- a/srcpkgs/python-functools32/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-functools32'
-pkgname=python-functools32
-version=3.2.3.post2
-revision=1
-archs=noarch
-wrksrc="functools32-${version/.post/-}"
-build_style=python2-module
-pycompile_module="functools32"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the functools module from Python 3.2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://github.com/MiCHiLU/python-functools32"
-distfiles="${PYPI_SITE}/f/functools32/functools32-${version/.post/-}.tar.gz"
-checksum=f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d

From aebe5bf9176763395c5c611a8803d90468daf451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:37:28 +0700
Subject: [PATCH 053/112] python-flaky: drop package

---
 srcpkgs/python-flaky/template  | 26 --------------------------
 srcpkgs/python3-flaky          |  1 -
 srcpkgs/python3-flaky/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-flaky/template
 delete mode 120000 srcpkgs/python3-flaky
 create mode 100644 srcpkgs/python3-flaky/template

diff --git a/srcpkgs/python-flaky/template b/srcpkgs/python-flaky/template
deleted file mode 100644
index e8e681421f7..00000000000
--- a/srcpkgs/python-flaky/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-flaky'
-pkgname=python-flaky
-version=3.6.1
-revision=2
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="flaky"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/box/flaky"
-distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
-checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698
-
-python3-flaky_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="flaky"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-flaky b/srcpkgs/python3-flaky
deleted file mode 120000
index f6467cfa1d3..00000000000
--- a/srcpkgs/python3-flaky
+++ /dev/null
@@ -1 +0,0 @@
-python-flaky
\ No newline at end of file
diff --git a/srcpkgs/python3-flaky/template b/srcpkgs/python3-flaky/template
new file mode 100644
index 00000000000..9441a9a4322
--- /dev/null
+++ b/srcpkgs/python3-flaky/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-flaky'
+pkgname=python3-flaky
+version=3.6.1
+revision=3
+wrksrc="flaky-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/box/flaky"
+distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
+checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698

From 61d3a1b20c9feeffd4fca196f545f9e5dd0e7d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:38:08 +0700
Subject: [PATCH 054/112] python-filetype: drop package

---
 srcpkgs/python-filetype/template  | 33 -------------------------------
 srcpkgs/python3-filetype          |  1 -
 srcpkgs/python3-filetype/template | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-filetype/template
 delete mode 120000 srcpkgs/python3-filetype
 create mode 100644 srcpkgs/python3-filetype/template

diff --git a/srcpkgs/python-filetype/template b/srcpkgs/python-filetype/template
deleted file mode 100644
index 10b974794b5..00000000000
--- a/srcpkgs/python-filetype/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-filetype'
-pkgname=python-filetype
-version=1.0.5
-revision=2
-archs=noarch
-wrksrc="filetype-${version}"
-build_style=python-module
-pycompile_module="filetype"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 package to infer file types"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="MIT"
-homepage="https://github.com/h2non/filetype.py"
-distfiles="${PYPI_SITE}/f/filetype/filetype-${version}.tar.gz"
-checksum=17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7
-
-post_install() {
-	vlicense LICENSE
-	rm -rf ${DESTDIR}/${py3_sitelib}/examples
-	rm -rf ${DESTDIR}/${py2_sitelib}/examples
-}
-
-python3-filetype_package() {
-	archs=noarch
-	pycompile_module="filetype"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-filetype b/srcpkgs/python3-filetype
deleted file mode 120000
index 334b708d789..00000000000
--- a/srcpkgs/python3-filetype
+++ /dev/null
@@ -1 +0,0 @@
-python-filetype
\ No newline at end of file
diff --git a/srcpkgs/python3-filetype/template b/srcpkgs/python3-filetype/template
new file mode 100644
index 00000000000..d9fcea8be46
--- /dev/null
+++ b/srcpkgs/python3-filetype/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-filetype'
+pkgname=python3-filetype
+version=1.0.5
+revision=3
+wrksrc="filetype-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 package to infer file types"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="MIT"
+homepage="https://github.com/h2non/filetype.py"
+distfiles="${PYPI_SITE}/f/filetype/filetype-${version}.tar.gz"
+checksum=17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7
+
+post_install() {
+	vlicense LICENSE
+	rm -rf ${DESTDIR}/${py3_sitelib}/examples
+	rm -rf ${DESTDIR}/${py2_sitelib}/examples
+}

From d003070d89fd8007636956c7d490be52a118212d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:38:56 +0700
Subject: [PATCH 055/112] python-exifread: drop package

---
 srcpkgs/python-exifread/template  | 39 -------------------------------
 srcpkgs/python3-exifread          |  1 -
 srcpkgs/python3-exifread/template | 24 +++++++++++++++++++
 3 files changed, 24 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/python-exifread/template
 delete mode 120000 srcpkgs/python3-exifread
 create mode 100644 srcpkgs/python3-exifread/template

diff --git a/srcpkgs/python-exifread/template b/srcpkgs/python-exifread/template
deleted file mode 100644
index 834aa7730ee..00000000000
--- a/srcpkgs/python-exifread/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-exifread'
-pkgname=python-exifread
-version=2.2.0
-revision=2
-archs=noarch
-wrksrc="exif-py-${version}"
-build_style="python-module"
-pycompile_module="exifread"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python module to extract Exif metadata (Python2)"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="BSD"
-homepage="https://github.com/ianare/exif-py"
-distfiles="https://github.com/ianare/exif-py/archive/${version}.tar.gz"
-checksum=55b8dbdfa1c55da50a0b989cbcd591bb996f36adff27cc207b350b25d76d2828
-alternatives="EXIF:EXIF.py:/usr/bin/EXIF.py2"
-
-pre_build() {
-	# Upstream didn't update version in this file
-	sed -i "s/2.1.2/${version}/" exifread/__init__.py
-}
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-exifread_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="exifread"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="EXIF:EXIF.py:/usr/bin/EXIF.py3"
-	pkg_install() {
-		vmove usr/bin/EXIF.py3
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-exifread b/srcpkgs/python3-exifread
deleted file mode 120000
index 652744bb61e..00000000000
--- a/srcpkgs/python3-exifread
+++ /dev/null
@@ -1 +0,0 @@
-python-exifread
\ No newline at end of file
diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template
new file mode 100644
index 00000000000..2e761202936
--- /dev/null
+++ b/srcpkgs/python3-exifread/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-exifread'
+pkgname=python3-exifread
+version=2.2.0
+revision=3
+wrksrc="exif-py-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python module to extract Exif metadata (Python3)"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-3-Clause"
+homepage="https://github.com/ianare/exif-py"
+distfiles="https://github.com/ianare/exif-py/archive/${version}.tar.gz"
+checksum=e35dde63168abcdadd79d613fbcaffd81e674ac067cd534f1f4a05a1305a2dc7
+conflicts="python-exifread>=0"
+
+pre_build() {
+	# Upstream didn't update version in this file
+	sed -i "s/2.1.2/${version}/" exifread/__init__.py
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 9579e45d177875610c3c2c9757c551c16dfa2990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:39:27 +0700
Subject: [PATCH 056/112] python-enzyme: drop package

---
 srcpkgs/python-enzyme/template  | 26 --------------------------
 srcpkgs/python3-enzyme          |  1 -
 srcpkgs/python3-enzyme/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-enzyme/template
 delete mode 120000 srcpkgs/python3-enzyme
 create mode 100644 srcpkgs/python3-enzyme/template

diff --git a/srcpkgs/python-enzyme/template b/srcpkgs/python-enzyme/template
deleted file mode 100644
index f28f40b0319..00000000000
--- a/srcpkgs/python-enzyme/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-enzyme'
-pkgname=python-enzyme
-version=0.4.1
-revision=2
-archs=noarch
-wrksrc="enzyme-${version}"
-build_style=python-module
-pycompile_module="enzyme"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Enzyme is a Python module to parse video metadata (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="Apache-2.0"
-homepage="https://github.com/Diaoul/enzyme"
-distfiles="${PYPI_SITE}/e/enzyme/enzyme-${version}.tar.gz"
-checksum=f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb
-
-python3-enzyme_package() {
-	archs=noarch
-	pycompile_module="enzyme"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-enzyme b/srcpkgs/python3-enzyme
deleted file mode 120000
index 3e6774516c9..00000000000
--- a/srcpkgs/python3-enzyme
+++ /dev/null
@@ -1 +0,0 @@
-python-enzyme
\ No newline at end of file
diff --git a/srcpkgs/python3-enzyme/template b/srcpkgs/python3-enzyme/template
new file mode 100644
index 00000000000..4fb13e7aa27
--- /dev/null
+++ b/srcpkgs/python3-enzyme/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-enzyme'
+pkgname=python3-enzyme
+version=0.4.1
+revision=3
+wrksrc="enzyme-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Enzyme is a Python module to parse video metadata (Python3)"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="Apache-2.0"
+homepage="https://github.com/Diaoul/enzyme"
+distfiles="${PYPI_SITE}/e/enzyme/enzyme-${version}.tar.gz"
+checksum=f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb

From 54d2e2f7a7333d96feba3c5be9df58ba9b5c6561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:39:43 +0700
Subject: [PATCH 057/112] python-envdir: drop package

---
 srcpkgs/python-envdir/template  | 38 ---------------------------------
 srcpkgs/python3-envdir          |  1 -
 srcpkgs/python3-envdir/template | 19 +++++++++++++++++
 3 files changed, 19 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/python-envdir/template
 delete mode 120000 srcpkgs/python3-envdir
 create mode 100644 srcpkgs/python3-envdir/template

diff --git a/srcpkgs/python-envdir/template b/srcpkgs/python-envdir/template
deleted file mode 100644
index b8cccad60ac..00000000000
--- a/srcpkgs/python-envdir/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-envdir'
-pkgname=python-envdir
-version=1.0.1
-revision=3
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="envdir"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 port of daemontools' envdir"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jezdez/envdir"
-distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz"
-checksum=779a308a07a673f391db87ef639d4b0f9921238bba02dd3e98c3281520faee95
-alternatives="
- envdir:envdir:/usr/bin/envdir2
- envdir:envshell:/usr/bin/envshell2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-envdir_package() {
-	alternatives="
-	 envdir:envdir:/usr/bin/envdir3
-	 envdir:envshell:/usr/bin/envshell3"
-	archs=noarch
-	pycompile_module="envdir"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-envdir b/srcpkgs/python3-envdir
deleted file mode 120000
index c07d3a24f31..00000000000
--- a/srcpkgs/python3-envdir
+++ /dev/null
@@ -1 +0,0 @@
-python-envdir
\ No newline at end of file
diff --git a/srcpkgs/python3-envdir/template b/srcpkgs/python3-envdir/template
new file mode 100644
index 00000000000..65975f4a61c
--- /dev/null
+++ b/srcpkgs/python3-envdir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-envdir'
+pkgname=python3-envdir
+version=1.0.1
+revision=4
+wrksrc="envdir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Python3 port of daemontools' envdir"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/jezdez/envdir"
+distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz"
+checksum=779a308a07a673f391db87ef639d4b0f9921238bba02dd3e98c3281520faee95
+conflicts="python-envdir>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 51dea292f39e0a252b7bb4e1ab76a29323aefaa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:40:51 +0700
Subject: [PATCH 058/112] python-entrypoints: drop package

---
 srcpkgs/python-entrypoints/template           | 37 -------------------
 srcpkgs/python3-entrypoints                   |  1 -
 .../patches/setup.py.patch                    |  0
 srcpkgs/python3-entrypoints/template          | 22 +++++++++++
 4 files changed, 22 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-entrypoints/template
 delete mode 120000 srcpkgs/python3-entrypoints
 rename srcpkgs/{python-entrypoints => python3-entrypoints}/patches/setup.py.patch (100%)
 create mode 100644 srcpkgs/python3-entrypoints/template

diff --git a/srcpkgs/python-entrypoints/template b/srcpkgs/python-entrypoints/template
deleted file mode 100644
index 6070650f35d..00000000000
--- a/srcpkgs/python-entrypoints/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-entrypoints'
-pkgname=python-entrypoints
-version=0.3
-revision=2
-archs=noarch
-wrksrc="entrypoints-${version}"
-build_style=python-module
-pycompile_module="entrypoints.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.configparser"
-short_desc="Discover and load entry points from installed packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/takluyver/entrypoints"
-distfiles="https://github.com/takluyver/entrypoints/archive/${version}.tar.gz"
-checksum=f26eddc371e37d8e9f6663b77524d6731567f005bd1e4ac950c0e33c48fbc065
-
-pre_build() {
-	sed -i "s|@VERSION@|${version}|" setup.py
-}
-post_install() {
-	for pyver in $python_versions; do
-		vinstall entrypoints.py 644 usr/lib/python${pyver}/site-packages
-	done
-	vlicense LICENSE
-}
-
-python3-entrypoints_package() {
-	archs=noarch
-	pycompile_module="entrypoints.py"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-entrypoints b/srcpkgs/python3-entrypoints
deleted file mode 120000
index 33316dfeacf..00000000000
--- a/srcpkgs/python3-entrypoints
+++ /dev/null
@@ -1 +0,0 @@
-python-entrypoints
\ No newline at end of file
diff --git a/srcpkgs/python-entrypoints/patches/setup.py.patch b/srcpkgs/python3-entrypoints/patches/setup.py.patch
similarity index 100%
rename from srcpkgs/python-entrypoints/patches/setup.py.patch
rename to srcpkgs/python3-entrypoints/patches/setup.py.patch
diff --git a/srcpkgs/python3-entrypoints/template b/srcpkgs/python3-entrypoints/template
new file mode 100644
index 00000000000..85c910e46c1
--- /dev/null
+++ b/srcpkgs/python3-entrypoints/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-entrypoints'
+pkgname=python3-entrypoints
+version=0.3
+revision=3
+wrksrc="entrypoints-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Discover and load entry points from installed packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/takluyver/entrypoints"
+distfiles="https://github.com/takluyver/entrypoints/archive/${version}.tar.gz"
+checksum=f26eddc371e37d8e9f6663b77524d6731567f005bd1e4ac950c0e33c48fbc065
+
+pre_build() {
+	vsed -i "s|@VERSION@|${version}|" setup.py
+}
+post_install() {
+	vinstall entrypoints.py 644 usr/lib/python${py3_ver}/site-packages
+	vlicense LICENSE
+}

From 46f437fbe146ab359863715e481ea1f0e0e769f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:51:00 +0700
Subject: [PATCH 059/112] python-empy: drop package

---
 srcpkgs/python3-empy                          |  1 -
 .../{python-empy => python3-empy}/template    | 24 +++++--------------
 srcpkgs/{python-empy => python3-empy}/update  |  0
 3 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-empy
 rename srcpkgs/{python-empy => python3-empy}/template (51%)
 rename srcpkgs/{python-empy => python3-empy}/update (100%)

diff --git a/srcpkgs/python3-empy b/srcpkgs/python3-empy
deleted file mode 120000
index 55ee445c634..00000000000
--- a/srcpkgs/python3-empy
+++ /dev/null
@@ -1 +0,0 @@
-python-empy
\ No newline at end of file
diff --git a/srcpkgs/python-empy/template b/srcpkgs/python3-empy/template
similarity index 51%
rename from srcpkgs/python-empy/template
rename to srcpkgs/python3-empy/template
index 4668a9cc814..0ce3edb677e 100644
--- a/srcpkgs/python-empy/template
+++ b/srcpkgs/python3-empy/template
@@ -1,13 +1,11 @@
-# Template file for 'python-empy'
-pkgname=python-empy
+# Template file for 'python3-empy'
+pkgname=python3-empy
 version=3.3.4
-revision=2
-archs=noarch
+revision=3
 wrksrc="empy-${version}"
-build_style=python-module
-pycompile_module="EmPy"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
 short_desc="Powerful and robust templating system for Python"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="LGPL-3.0-or-later"
@@ -18,13 +16,3 @@ checksum=9126211471fc7ff83fdd40beca93eb6de5681758fbe68b4cf8af6326259df1b1
 do_check() {
 	./test.sh
 }
-
-python3-empy_package() {
-	archs=noarch
-	pycompile_module="EmPy"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-empy/update b/srcpkgs/python3-empy/update
similarity index 100%
rename from srcpkgs/python-empy/update
rename to srcpkgs/python3-empy/update

From f3d03e6532fa06f7aa2965c85b89a2d463ac6833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:51:30 +0700
Subject: [PATCH 060/112] python-dominate: drop package

---
 srcpkgs/python-dominate/template  | 22 ----------------------
 srcpkgs/python3-dominate          |  1 -
 srcpkgs/python3-dominate/template | 13 +++++++++++++
 3 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python-dominate/template
 delete mode 120000 srcpkgs/python3-dominate
 create mode 100644 srcpkgs/python3-dominate/template

diff --git a/srcpkgs/python-dominate/template b/srcpkgs/python-dominate/template
deleted file mode 100644
index 77fa674d156..00000000000
--- a/srcpkgs/python-dominate/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-dominate'
-pkgname=python-dominate
-version=2.5.2
-revision=1
-archs=noarch
-wrksrc="dominate-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Library for creating and manipulating HTML (Python2)"
-maintainer="Benjamín Albiñana <benalb@gmail.com>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/Knio/dominate"
-distfiles="https://github.com/Knio/dominate/archive/${version}.tar.gz"
-checksum=a184e19ca36646a85ec40b83fe3762c08834ffe51499ec436eeb6646edde36ac
-
-python3-dominate_package() {
-	archs=noarch
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-dominate b/srcpkgs/python3-dominate
deleted file mode 120000
index 25538723ef6..00000000000
--- a/srcpkgs/python3-dominate
+++ /dev/null
@@ -1 +0,0 @@
-python-dominate/
\ No newline at end of file
diff --git a/srcpkgs/python3-dominate/template b/srcpkgs/python3-dominate/template
new file mode 100644
index 00000000000..225d5042db1
--- /dev/null
+++ b/srcpkgs/python3-dominate/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-dominate'
+pkgname=python3-dominate
+version=2.5.2
+revision=2
+wrksrc="dominate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Library for creating and manipulating HTML (Python3)"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/Knio/dominate"
+distfiles="https://github.com/Knio/dominate/archive/${version}.tar.gz"
+checksum=a184e19ca36646a85ec40b83fe3762c08834ffe51499ec436eeb6646edde36ac

From 7bebfc771646be47bc09068fe0cf8950f1d02d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:52:45 +0700
Subject: [PATCH 061/112] python-docopt: drop package

---
 srcpkgs/python-docopt/template  | 31 -------------------------------
 srcpkgs/python3-docopt          |  1 -
 srcpkgs/python3-docopt/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-docopt/template
 delete mode 120000 srcpkgs/python3-docopt
 create mode 100644 srcpkgs/python3-docopt/template

diff --git a/srcpkgs/python-docopt/template b/srcpkgs/python-docopt/template
deleted file mode 100644
index 48e5f86c1e0..00000000000
--- a/srcpkgs/python-docopt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-docopt'
-pkgname=python-docopt
-version=0.6.2
-revision=5
-archs=noarch
-wrksrc="docopt-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="docopt.py"
-short_desc="Pythonic argument parser, that will make you smile (Python2)"
-maintainer="Sergi Alvarez <pancake@nopcode.org>"
-homepage="http://docopt.org/"
-license="MIT"
-distfiles="${PYPI_SITE}/d/docopt/docopt-${version}.tar.gz"
-checksum=49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
-
-post_install() {
-	vlicense LICENSE-MIT
-}
-
-python3-docopt_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="docopt.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE-MIT
-	}
-}
diff --git a/srcpkgs/python3-docopt b/srcpkgs/python3-docopt
deleted file mode 120000
index 1170806e939..00000000000
--- a/srcpkgs/python3-docopt
+++ /dev/null
@@ -1 +0,0 @@
-python-docopt
\ No newline at end of file
diff --git a/srcpkgs/python3-docopt/template b/srcpkgs/python3-docopt/template
new file mode 100644
index 00000000000..46be2c428d2
--- /dev/null
+++ b/srcpkgs/python3-docopt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-docopt'
+pkgname=python3-docopt
+version=0.6.2
+revision=6
+wrksrc="docopt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pythonic argument parser, that will make you smile (Python3)"
+maintainer="Sergi Alvarez <pancake@nopcode.org>"
+license="MIT"
+homepage="http://docopt.org/"
+distfiles="${PYPI_SITE}/d/docopt/docopt-${version}.tar.gz"
+checksum=49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
+
+post_install() {
+	vlicense LICENSE-MIT
+}

From b19b0b5986f798a94888e7ff46dd76cb668a5d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:53:08 +0700
Subject: [PATCH 062/112] python-dockerpty: drop package

---
 srcpkgs/python-dockerpty/template  | 26 --------------------------
 srcpkgs/python3-dockerpty          |  1 -
 srcpkgs/python3-dockerpty/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-dockerpty/template
 delete mode 120000 srcpkgs/python3-dockerpty
 create mode 100644 srcpkgs/python3-dockerpty/template

diff --git a/srcpkgs/python-dockerpty/template b/srcpkgs/python-dockerpty/template
deleted file mode 100644
index 4a0b3a7a33f..00000000000
--- a/srcpkgs/python-dockerpty/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-dockerpty'
-pkgname=python-dockerpty
-version=0.4.1
-revision=4
-archs=noarch
-wrksrc="dockerpty-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-docker"
-pycompile_module="dockerpty"
-short_desc="Python2 library to use the pseudo-tty of a docker container"
-maintainer="Sergi Alvarez <pancake@nopcode.org>"
-homepage="https://github.com/d11wtq/dockerpty"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/d/dockerpty/dockerpty-${version}.tar.gz"
-checksum=69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce
-
-python3-dockerpty_package() {
-	archs=noarch
-	depends="python3-six python3-docker"
-	pycompile_module="dockerpty"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-dockerpty b/srcpkgs/python3-dockerpty
deleted file mode 120000
index 2e00ef1a0fc..00000000000
--- a/srcpkgs/python3-dockerpty
+++ /dev/null
@@ -1 +0,0 @@
-python-dockerpty
\ No newline at end of file
diff --git a/srcpkgs/python3-dockerpty/template b/srcpkgs/python3-dockerpty/template
new file mode 100644
index 00000000000..2ad010f0b10
--- /dev/null
+++ b/srcpkgs/python3-dockerpty/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-dockerpty'
+pkgname=python3-dockerpty
+version=0.4.1
+revision=5
+wrksrc="dockerpty-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-docker"
+short_desc="Python3 library to use the pseudo-tty of a docker container"
+maintainer="Sergi Alvarez <pancake@nopcode.org>"
+license="Apache-2.0"
+homepage="https://github.com/d11wtq/dockerpty"
+distfiles="${PYPI_SITE}/d/dockerpty/dockerpty-${version}.tar.gz"
+checksum=69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce

From bf268144dbedf125cec63f04dc219a3d67c068f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:53:58 +0700
Subject: [PATCH 063/112] python-defusedxml: drop package

---
 srcpkgs/python-defusedxml/template  | 31 -----------------------------
 srcpkgs/python3-defusedxml          |  1 -
 srcpkgs/python3-defusedxml/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-defusedxml/template
 delete mode 120000 srcpkgs/python3-defusedxml
 create mode 100644 srcpkgs/python3-defusedxml/template

diff --git a/srcpkgs/python-defusedxml/template b/srcpkgs/python-defusedxml/template
deleted file mode 100644
index 96234eb18c7..00000000000
--- a/srcpkgs/python-defusedxml/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-defusedxml'
-pkgname=python-defusedxml
-version=0.6.0
-revision=2
-archs=noarch
-wrksrc="defusedxml-${version}"
-build_style=python-module
-pycompile_module="defusedxml"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Defusing XML bombs and other exploits (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://github.com/tiran/defusedxml"
-distfiles="${PYPI_SITE}/d/defusedxml/defusedxml-${version}.tar.gz"
-checksum=f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-defusedxml_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="defusedxml"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-defusedxml b/srcpkgs/python3-defusedxml
deleted file mode 120000
index 537bcef0939..00000000000
--- a/srcpkgs/python3-defusedxml
+++ /dev/null
@@ -1 +0,0 @@
-python-defusedxml
\ No newline at end of file
diff --git a/srcpkgs/python3-defusedxml/template b/srcpkgs/python3-defusedxml/template
new file mode 100644
index 00000000000..a09539f4136
--- /dev/null
+++ b/srcpkgs/python3-defusedxml/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-defusedxml'
+pkgname=python3-defusedxml
+version=0.6.0
+revision=3
+wrksrc="defusedxml-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Defusing XML bombs and other exploits (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://github.com/tiran/defusedxml"
+distfiles="${PYPI_SITE}/d/defusedxml/defusedxml-${version}.tar.gz"
+checksum=f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5
+
+post_install() {
+	vlicense LICENSE
+}

From 2be6b2ff71b97ab69fce59c0621b2d131e963d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:54:28 +0700
Subject: [PATCH 064/112] python-daemonize: drop package

---
 srcpkgs/python-daemonize/template  | 31 ------------------------------
 srcpkgs/python3-daemonize          |  1 -
 srcpkgs/python3-daemonize/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-daemonize/template
 delete mode 120000 srcpkgs/python3-daemonize
 create mode 100644 srcpkgs/python3-daemonize/template

diff --git a/srcpkgs/python-daemonize/template b/srcpkgs/python-daemonize/template
deleted file mode 100644
index efaf163e573..00000000000
--- a/srcpkgs/python-daemonize/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-daemonize'
-pkgname=python-daemonize
-version=2.5.0
-revision=2
-archs=noarch
-wrksrc="daemonize-${version}"
-build_style=python-module
-pycompile_module="daemonize.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Daemonize is a library for writing system daemons in Python (Python2)"
-maintainer="Luca Weiss <luca@z3ntu.xyz>"
-license="MIT"
-homepage="https://github.com/thesharp/daemonize"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=72ed6f7de45a50feea51017df8cf0829a903ca8b8d0b2453261dfbb1cdeb9481
-
-post_Install() {
-	vlicense LICENSE
-}
-
-python3-daemonize_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="daemonize.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-daemonize b/srcpkgs/python3-daemonize
deleted file mode 120000
index 0afab583a5e..00000000000
--- a/srcpkgs/python3-daemonize
+++ /dev/null
@@ -1 +0,0 @@
-python-daemonize
\ No newline at end of file
diff --git a/srcpkgs/python3-daemonize/template b/srcpkgs/python3-daemonize/template
new file mode 100644
index 00000000000..a0870abb617
--- /dev/null
+++ b/srcpkgs/python3-daemonize/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-daemonize'
+pkgname=python3-daemonize
+version=2.5.0
+revision=3
+wrksrc="daemonize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Daemonize is a library for writing system daemons in Python (Python3)"
+maintainer="Luca Weiss <luca@z3ntu.xyz>"
+license="MIT"
+homepage="https://github.com/thesharp/daemonize"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=72ed6f7de45a50feea51017df8cf0829a903ca8b8d0b2453261dfbb1cdeb9481
+
+post_Install() {
+	vlicense LICENSE
+}

From 0c24ef38dbbd18fc120a3e8d6d171355bd2e6374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:54:59 +0700
Subject: [PATCH 065/112] python-cycler: drop package

---
 srcpkgs/python-cycler/template  | 31 -------------------------------
 srcpkgs/python3-cycler          |  1 -
 srcpkgs/python3-cycler/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-cycler/template
 delete mode 120000 srcpkgs/python3-cycler
 create mode 100644 srcpkgs/python3-cycler/template

diff --git a/srcpkgs/python-cycler/template b/srcpkgs/python-cycler/template
deleted file mode 100644
index 0b53c195dae..00000000000
--- a/srcpkgs/python-cycler/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-cycler'
-pkgname=python-cycler
-version=0.10.0
-revision=5
-archs=noarch
-wrksrc="cycler-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-pycompile_module="cycler.py"
-short_desc="Composable style cycles (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/matplotlib/cycler"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/C/Cycler/cycler-${version}.tar.gz"
-checksum=cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-cycler_package() {
-	archs=noarch
-	depends="python3-six"
-	pycompile_module="cycler.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-cycler b/srcpkgs/python3-cycler
deleted file mode 120000
index e62ba8c9689..00000000000
--- a/srcpkgs/python3-cycler
+++ /dev/null
@@ -1 +0,0 @@
-python-cycler
\ No newline at end of file
diff --git a/srcpkgs/python3-cycler/template b/srcpkgs/python3-cycler/template
new file mode 100644
index 00000000000..7c4083a39af
--- /dev/null
+++ b/srcpkgs/python3-cycler/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-cycler'
+pkgname=python3-cycler
+version=0.10.0
+revision=6
+wrksrc="cycler-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Composable style cycles (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/matplotlib/cycler"
+distfiles="${PYPI_SITE}/C/Cycler/cycler-${version}.tar.gz"
+checksum=cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8
+
+post_install() {
+	vlicense LICENSE
+}

From 8afcc76ca4d815c705c13931512d7b564f738017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:56:16 +0700
Subject: [PATCH 066/112] python-cssutils: drop package

---
 srcpkgs/python-cssutils/template  | 36 -------------------------------
 srcpkgs/python3-cssutils          |  1 -
 srcpkgs/python3-cssutils/template | 17 +++++++++++++++
 3 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/python-cssutils/template
 delete mode 120000 srcpkgs/python3-cssutils
 create mode 100644 srcpkgs/python3-cssutils/template

diff --git a/srcpkgs/python-cssutils/template b/srcpkgs/python-cssutils/template
deleted file mode 100644
index 5f08903b9a0..00000000000
--- a/srcpkgs/python-cssutils/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'python-cssutils'
-pkgname=python-cssutils
-version=1.0.2
-revision=3
-archs=noarch
-wrksrc="cssutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-pycompile_module="cssutils encutils"
-short_desc="A CSS Cascading Style Sheets library for Python2"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="LGPL-3"
-homepage="https://pypi.org/project/cssutils/"
-distfiles="${PYPI_SITE}/c/cssutils/cssutils-${version}.tar.gz"
-checksum=a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf
-
-alternatives="
- cssutils:csscapture:/usr/bin/csscapture2
- cssutils:csscombine:/usr/bin/csscombine2
- cssutils:cssparse:/usr/bin/cssparse2"
-
-python3-cssutils_package() {
-	alternatives="
-	 cssutils:csscapture:/usr/bin/csscapture3
-	 cssutils:csscombine:/usr/bin/csscombine3
-	 cssutils:cssparse:/usr/bin/cssparse3"
-	archs=noarch
-	pycompile_module="cssutils encutils"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-cssutils b/srcpkgs/python3-cssutils
deleted file mode 120000
index 137f7b229af..00000000000
--- a/srcpkgs/python3-cssutils
+++ /dev/null
@@ -1 +0,0 @@
-python-cssutils
\ No newline at end of file
diff --git a/srcpkgs/python3-cssutils/template b/srcpkgs/python3-cssutils/template
new file mode 100644
index 00000000000..7ed166c2b0c
--- /dev/null
+++ b/srcpkgs/python3-cssutils/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-cssutils'
+pkgname=python3-cssutils
+version=1.0.2
+revision=4
+wrksrc="cssutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="CSS Cascading Style Sheets library for Python3"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+# source files write 3.0-or-later, PKG-INFO writes 2.1
+license="LGPL-3.0-or-later"
+homepage="https://pypi.org/project/cssutils/"
+distfiles="${PYPI_SITE}/c/cssutils/cssutils-${version}.tar.gz"
+checksum=a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf
+
+conflicts="python-cssutils>=0"

From a453dfcd6408456b01660d8ed4f74c78dcf5c779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:59:20 +0700
Subject: [PATCH 067/112] python-cram: drop package

---
 srcpkgs/python-cram/template  | 29 -----------------------------
 srcpkgs/python3-cram          |  1 -
 srcpkgs/python3-cram/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-cram/template
 delete mode 120000 srcpkgs/python3-cram
 create mode 100644 srcpkgs/python3-cram/template

diff --git a/srcpkgs/python-cram/template b/srcpkgs/python-cram/template
deleted file mode 100644
index 8c5d65fe260..00000000000
--- a/srcpkgs/python-cram/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cram'
-pkgname=python-cram
-version=0.7
-revision=3
-archs=noarch
-wrksrc="cram-${version}"
-build_style=python-module
-pycompile_module="cram"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple testing framework for commandline applications (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitheap.org/cram/"
-distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz"
-checksum=7da7445af2ce15b90aad5ec4792f857cef5786d71f14377e9eb994d8b8337f2f
-alternatives="cram:cram:/usr/bin/cram2"
-
-python3-cram_package() {
-	archs=noarch
-	pycompile_module="cram"
-	alternatives="cram:cram:/usr/bin/cram3"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-cram b/srcpkgs/python3-cram
deleted file mode 120000
index b68583c2d34..00000000000
--- a/srcpkgs/python3-cram
+++ /dev/null
@@ -1 +0,0 @@
-python-cram
\ No newline at end of file
diff --git a/srcpkgs/python3-cram/template b/srcpkgs/python3-cram/template
new file mode 100644
index 00000000000..fc42482ede5
--- /dev/null
+++ b/srcpkgs/python3-cram/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-cram'
+pkgname=python3-cram
+version=0.7
+revision=4
+wrksrc="cram-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple testing framework for commandline applications (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://bitheap.org/cram/"
+distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz"
+checksum=7da7445af2ce15b90aad5ec4792f857cef5786d71f14377e9eb994d8b8337f2f
+conflicts="python-cram>=0"

From 509be26fc7b5bfcd4025bc37c950c57320a1e7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:01:26 +0700
Subject: [PATCH 068/112] python-llfuse: drop package

---
 srcpkgs/python-llfuse/template  | 22 ----------------------
 srcpkgs/python3-llfuse          |  1 -
 srcpkgs/python3-llfuse/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python-llfuse/template
 delete mode 120000 srcpkgs/python3-llfuse
 create mode 100644 srcpkgs/python3-llfuse/template

diff --git a/srcpkgs/python-llfuse/template b/srcpkgs/python-llfuse/template
deleted file mode 100644
index b453c67e91d..00000000000
--- a/srcpkgs/python-llfuse/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-llfuse'
-pkgname=python-llfuse
-version=1.3.6
-revision=2
-wrksrc="llfuse-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel fuse-devel attr-devel"
-depends="python-contextlib2"
-short_desc="Python2 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
-
-python3-llfuse_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-llfuse b/srcpkgs/python3-llfuse
deleted file mode 120000
index 5751629a3c0..00000000000
--- a/srcpkgs/python3-llfuse
+++ /dev/null
@@ -1 +0,0 @@
-python-llfuse
\ No newline at end of file
diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
new file mode 100644
index 00000000000..305924d199a
--- /dev/null
+++ b/srcpkgs/python3-llfuse/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-llfuse'
+pkgname=python3-llfuse
+version=1.3.6
+revision=2
+wrksrc="llfuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools 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

From 3a17d4210ec91084170b86623e197f9ba8130bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:02:48 +0700
Subject: [PATCH 069/112] python-construct: drop package

---
 srcpkgs/python-construct/template  | 31 ------------------------------
 srcpkgs/python3-construct          |  1 -
 srcpkgs/python3-construct/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-construct/template
 delete mode 120000 srcpkgs/python3-construct
 create mode 100644 srcpkgs/python3-construct/template

diff --git a/srcpkgs/python-construct/template b/srcpkgs/python-construct/template
deleted file mode 100644
index d6d0b8010e2..00000000000
--- a/srcpkgs/python-construct/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-construct'
-pkgname=python-construct
-version=2.9.45
-revision=3
-archs=noarch
-wrksrc="construct-${version}"
-build_style=python-module
-pycompile_module="construct"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Powerful declarative symmetric parser/builder for binary data (Python2)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://construct.readthedocs.org/"
-distfiles="${PYPI_SITE}/c/construct/construct-${version}.tar.gz"
-checksum=2271a0efd0798679dea825ff47e22a4c550456a5db0ba8baa82f7eae0af0118c
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-construct_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="construct"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-construct b/srcpkgs/python3-construct
deleted file mode 120000
index 1126a969071..00000000000
--- a/srcpkgs/python3-construct
+++ /dev/null
@@ -1 +0,0 @@
-python-construct
\ No newline at end of file
diff --git a/srcpkgs/python3-construct/template b/srcpkgs/python3-construct/template
new file mode 100644
index 00000000000..3fa3d0018e9
--- /dev/null
+++ b/srcpkgs/python3-construct/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-construct'
+pkgname=python3-construct
+version=2.9.45
+revision=4
+wrksrc="construct-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Powerful declarative symmetric parser/builder for binary data (Python3)"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://construct.readthedocs.org/"
+distfiles="${PYPI_SITE}/c/construct/construct-${version}.tar.gz"
+checksum=2271a0efd0798679dea825ff47e22a4c550456a5db0ba8baa82f7eae0af0118c
+
+post_install() {
+	vlicense LICENSE
+}

From 4e53da8d2dd28775999891b35f334fa3e01e256a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:03:23 +0700
Subject: [PATCH 070/112] python-colorama: drop package

---
 srcpkgs/python-colorama/template  | 31 -------------------------------
 srcpkgs/python3-colorama          |  1 -
 srcpkgs/python3-colorama/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-colorama/template
 delete mode 120000 srcpkgs/python3-colorama
 create mode 100644 srcpkgs/python3-colorama/template

diff --git a/srcpkgs/python-colorama/template b/srcpkgs/python-colorama/template
deleted file mode 100644
index 09562385243..00000000000
--- a/srcpkgs/python-colorama/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-colorama'
-pkgname=python-colorama
-version=0.4.1
-revision=2
-archs=noarch
-wrksrc="colorama-${version}"
-build_style=python-module
-pycompile_module="colorama"
-hostmakedepends="unzip python-setuptools python3-setuptools"
-depends="python"
-short_desc="Cross-platform colored terminal text (Python2)"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-3-Clause"
-homepage="https://github.com/tartley/colorama"
-distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
-checksum=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-colorama_package() {
-	archs=noarch
-	pycompile_module="colorama"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-colorama b/srcpkgs/python3-colorama
deleted file mode 120000
index 76099af1310..00000000000
--- a/srcpkgs/python3-colorama
+++ /dev/null
@@ -1 +0,0 @@
-python-colorama
\ No newline at end of file
diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
new file mode 100644
index 00000000000..0c5a1c44626
--- /dev/null
+++ b/srcpkgs/python3-colorama/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-colorama'
+pkgname=python3-colorama
+version=0.4.1
+revision=3
+wrksrc="colorama-${version}"
+build_style=python3-module
+hostmakedepends="unzip python3-setuptools"
+depends="python3"
+short_desc="Cross-platform colored terminal text (Python3)"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-3-Clause"
+homepage="https://github.com/tartley/colorama"
+distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
+checksum=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 973ba49ba7db8ee484e3d976eb910c232e31d70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:03:51 +0700
Subject: [PATCH 071/112] python-codespell: drop package

---
 srcpkgs/python-codespell/template  | 29 -----------------------------
 srcpkgs/python3-codespell          |  1 -
 srcpkgs/python3-codespell/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-codespell/template
 delete mode 120000 srcpkgs/python3-codespell
 create mode 100644 srcpkgs/python3-codespell/template

diff --git a/srcpkgs/python-codespell/template b/srcpkgs/python-codespell/template
deleted file mode 100644
index 9ae2e19435c..00000000000
--- a/srcpkgs/python-codespell/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-codespell'
-pkgname=python-codespell
-version=1.16.0
-revision=2
-archs=noarch
-wrksrc="codespell-${version}"
-build_style=python-module
-pycompile_module="codespell_lib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Checks code for common spelling mistakes (Python2)"
-maintainer="Nathan <ndowens04@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/codespell-project/codespell"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=53d22aefa1daf3365ca4625877271d23d143c0a92c16e55daf5cd14b6494b8f4
-alternatives="python-codespell:codespell:/usr/bin/codespell2"
-
-python3-codespell_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	pycompile_module="codespell_lib"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="python-codespell:codespell:/usr/bin/codespell3"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vmove usr/bin/codespell3
-	}
-}
diff --git a/srcpkgs/python3-codespell b/srcpkgs/python3-codespell
deleted file mode 120000
index 2784e18e19a..00000000000
--- a/srcpkgs/python3-codespell
+++ /dev/null
@@ -1 +0,0 @@
-python-codespell
\ No newline at end of file
diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
new file mode 100644
index 00000000000..04e342d5e5c
--- /dev/null
+++ b/srcpkgs/python3-codespell/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-codespell'
+pkgname=python3-codespell
+version=1.16.0
+revision=3
+wrksrc="codespell-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Checks code for common spelling mistakes (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/codespell-project/codespell"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=53d22aefa1daf3365ca4625877271d23d143c0a92c16e55daf5cd14b6494b8f4
+conflicts="python-codespell>=0"

From 613d59d6f5fe8b0b9e1069362fc786fdef1545a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:04:18 +0700
Subject: [PATCH 072/112] python-click-log: drop package

---
 srcpkgs/python-click-log/template  | 31 ------------------------------
 srcpkgs/python3-click-log          |  1 -
 srcpkgs/python3-click-log/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-click-log/template
 delete mode 120000 srcpkgs/python3-click-log
 create mode 100644 srcpkgs/python3-click-log/template

diff --git a/srcpkgs/python-click-log/template b/srcpkgs/python-click-log/template
deleted file mode 100644
index b57a7a74b4a..00000000000
--- a/srcpkgs/python-click-log/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-click-log'
-pkgname=python-click-log
-version=0.3.2
-revision=2
-archs=noarch
-wrksrc="click-log-${version}"
-build_style="python-module"
-pycompile_module="click_log"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-click"
-short_desc="Logging integration for Click (Python2)"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="MIT"
-homepage="https://github.com/click-contrib/click-log"
-distfiles="${PYPI_SITE}/c/click-log/click-log-${version}.tar.gz"
-checksum=16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-click-log_package() {
-	archs=noarch
-	pycompile_module="click_log"
-	depends="python3-click"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-click-log b/srcpkgs/python3-click-log
deleted file mode 120000
index b6430133f92..00000000000
--- a/srcpkgs/python3-click-log
+++ /dev/null
@@ -1 +0,0 @@
-python-click-log
\ No newline at end of file
diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template
new file mode 100644
index 00000000000..340f9b17397
--- /dev/null
+++ b/srcpkgs/python3-click-log/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click-log'
+pkgname=python3-click-log
+version=0.3.2
+revision=3
+wrksrc="click-log-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3-click"
+short_desc="Logging integration for Click (Python3)"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-log"
+distfiles="${PYPI_SITE}/c/click-log/click-log-${version}.tar.gz"
+checksum=16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124
+
+post_install() {
+	vlicense LICENSE
+}

From 501b1af55d238e94813aabc810d75fc094b1fd85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:04:47 +0700
Subject: [PATCH 073/112] python-cliapp: drop package

---
 srcpkgs/python-cliapp/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/python-cliapp/template

diff --git a/srcpkgs/python-cliapp/template b/srcpkgs/python-cliapp/template
deleted file mode 100644
index fd2c8cc4d13..00000000000
--- a/srcpkgs/python-cliapp/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-cliapp'
-pkgname=python-cliapp
-version=1.20180121
-revision=1
-archs=noarch
-build_style=python2-module
-pycompile_module="cliapp"
-hostmakedepends="python-setuptools python-yaml"
-depends="python-yaml"
-short_desc="Framework for Unix-like command line programs for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://liw.fi/cliapp/"
-license="GPL-2"
-distfiles="http://code.liw.fi/debian/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.xz"
-checksum=e00d8d16198c5f02a995f05ce11cb3a60f9f6ec37c55332f0d9294dd4fa71006

From dbbacf89ecc8fbf8d068a538e421ee069ddc60c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:07:27 +0700
Subject: [PATCH 074/112] python-chroot: drop package

---
 srcpkgs/python-chroot/template  | 34 ---------------------------------
 srcpkgs/python3-chroot          |  1 -
 srcpkgs/python3-chroot/template | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-chroot/template
 delete mode 120000 srcpkgs/python3-chroot
 create mode 100644 srcpkgs/python3-chroot/template

diff --git a/srcpkgs/python-chroot/template b/srcpkgs/python-chroot/template
deleted file mode 100644
index 7faa0f4cce9..00000000000
--- a/srcpkgs/python-chroot/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-chroot'
-pkgname=python-chroot
-version=0.9.18
-revision=2
-archs=noarch
-wrksrc="pychroot-${version}"
-build_style=python-module
-pycompile_module="pychroot"
-hostmakedepends="python-setuptools python3-setuptools python-snakeoil python3-snakeoil"
-depends="python-snakeoil"
-short_desc="Python2 Library and CLI tool that simplify chroot handling"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD"
-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
-alternatives="chroot:pychroot:/usr/bin/pychroot2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-chroot_package() {
-	archs=noarch
-	depends="python3-snakeoil"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="chroot:pychroot:/usr/bin/pychroot3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmove usr/bin/pychroot3
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-chroot b/srcpkgs/python3-chroot
deleted file mode 120000
index f9c14f8f07b..00000000000
--- a/srcpkgs/python3-chroot
+++ /dev/null
@@ -1 +0,0 @@
-python-chroot
\ No newline at end of file
diff --git a/srcpkgs/python3-chroot/template b/srcpkgs/python3-chroot/template
new file mode 100644
index 00000000000..ff679c914cf
--- /dev/null
+++ b/srcpkgs/python3-chroot/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-chroot'
+pkgname=python3-chroot
+version=0.9.18
+revision=3
+wrksrc="pychroot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-snakeoil"
+depends="python3-snakeoil"
+short_desc="Python3 Library and CLI tool that simplify chroot handling"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+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
+conflicts="python-chroot>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 67e9dd02b08746b65f40a1d6cc8f356a28e1267d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:08:37 +0700
Subject: [PATCH 075/112] python-cairocffi: drop package

---
 srcpkgs/python-cairocffi/template             | 37 -------------------
 srcpkgs/python3-cairocffi                     |  1 -
 srcpkgs/python3-cairocffi/template            | 26 +++++++++++++
 .../update                                    |  0
 4 files changed, 26 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-cairocffi/template
 delete mode 120000 srcpkgs/python3-cairocffi
 create mode 100644 srcpkgs/python3-cairocffi/template
 rename srcpkgs/{python-cairocffi => python3-cairocffi}/update (100%)

diff --git a/srcpkgs/python-cairocffi/template b/srcpkgs/python-cairocffi/template
deleted file mode 100644
index 2cf2d6890cd..00000000000
--- a/srcpkgs/python-cairocffi/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-cairocffi'
-pkgname=python-cairocffi
-version=0.9.0
-revision=3
-archs=noarch
-wrksrc="cairocffi-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
-depends="python-cffi cairo gdk-pixbuf"
-checkdepends="python-more-itertools python-parsing python-scandir python-pytest cairo gdk-pixbuf"
-short_desc="CFFI-based cairo bindings for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/Kozea/cairocffi"
-distfiles="${PYPI_SITE}/c/cairocffi/cairocffi-${version}.tar.gz"
-checksum=15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337
-
-pre_check() {
-	export PY_IGNORE_IMPORTMISMATCH=1
-	vsed -e s/test_scaled_font/scaled_font/ -i build-2.7/lib/cairocffi/test_cairo.py
-	vsed -e s/test_context_font/context_font/ -i build-2.7/lib/cairocffi/test_cairo.py
-}
-
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-cairocffi_package() {
-	archs=noarch
-	depends="python3-cffi cairo"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-cairocffi b/srcpkgs/python3-cairocffi
deleted file mode 120000
index 8f58bd58c0f..00000000000
--- a/srcpkgs/python3-cairocffi
+++ /dev/null
@@ -1 +0,0 @@
-python-cairocffi
\ No newline at end of file
diff --git a/srcpkgs/python3-cairocffi/template b/srcpkgs/python3-cairocffi/template
new file mode 100644
index 00000000000..79c465e5bb9
--- /dev/null
+++ b/srcpkgs/python3-cairocffi/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-cairocffi'
+pkgname=python3-cairocffi
+version=0.9.0
+revision=4
+wrksrc="cairocffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-cffi"
+depends="python3-cffi cairo"
+checkdepends="cairo gdk-pixbuf"
+short_desc="CFFI-based cairo bindings for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/Kozea/cairocffi"
+distfiles="${PYPI_SITE}/c/cairocffi/cairocffi-${version}.tar.gz"
+checksum=15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337
+
+pre_check() {
+	export PY_IGNORE_IMPORTMISMATCH=1
+	vsed -e s/test_scaled_font/scaled_font/ -i build-2.7/lib/cairocffi/test_cairo.py
+	vsed -e s/test_context_font/context_font/ -i build-2.7/lib/cairocffi/test_cairo.py
+}
+
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-cairocffi/update b/srcpkgs/python3-cairocffi/update
similarity index 100%
rename from srcpkgs/python-cairocffi/update
rename to srcpkgs/python3-cairocffi/update

From c2d86a8d7f7d7406141acbabbe2744b66fca7326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:09:08 +0700
Subject: [PATCH 076/112] python-cached-property: drop package

---
 srcpkgs/python-cached-property/template  | 31 ------------------------
 srcpkgs/python3-cached-property          |  1 -
 srcpkgs/python3-cached-property/template | 18 ++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-cached-property/template
 delete mode 120000 srcpkgs/python3-cached-property
 create mode 100644 srcpkgs/python3-cached-property/template

diff --git a/srcpkgs/python-cached-property/template b/srcpkgs/python-cached-property/template
deleted file mode 100644
index 16c89346565..00000000000
--- a/srcpkgs/python-cached-property/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-cached-property'
-pkgname=python-cached-property
-version=1.5.1
-revision=2
-archs=noarch
-wrksrc="cached-property-${version}"
-build_style=python-module
-pycompile_module="cached_property.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Decorator for caching properties in classes (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pydanny/cached-property"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/c/cached-property/cached-property-${version}.tar.gz"
-checksum=9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-cached-property_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="cached_property.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-cached-property b/srcpkgs/python3-cached-property
deleted file mode 120000
index e3c4d2f4914..00000000000
--- a/srcpkgs/python3-cached-property
+++ /dev/null
@@ -1 +0,0 @@
-python-cached-property
\ No newline at end of file
diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template
new file mode 100644
index 00000000000..ddb395595cf
--- /dev/null
+++ b/srcpkgs/python3-cached-property/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-cached-property'
+pkgname=python3-cached-property
+version=1.5.1
+revision=3
+wrksrc="cached-property-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Decorator for caching properties in classes (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/pydanny/cached-property"
+distfiles="${PYPI_SITE}/c/cached-property/cached-property-${version}.tar.gz"
+checksum=9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504
+
+post_install() {
+	vlicense LICENSE
+}

From dae915340edbbd0ffe72f47f23901e63465b88ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:09:30 +0700
Subject: [PATCH 077/112] python-bottle: drop package

---
 srcpkgs/python3-bottle                        |  1 -
 .../template                                  | 24 +++++--------------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-bottle
 rename srcpkgs/{python-bottle => python3-bottle}/template (50%)

diff --git a/srcpkgs/python3-bottle b/srcpkgs/python3-bottle
deleted file mode 120000
index 7124ef22d99..00000000000
--- a/srcpkgs/python3-bottle
+++ /dev/null
@@ -1 +0,0 @@
-python-bottle
\ No newline at end of file
diff --git a/srcpkgs/python-bottle/template b/srcpkgs/python3-bottle/template
similarity index 50%
rename from srcpkgs/python-bottle/template
rename to srcpkgs/python3-bottle/template
index 0ffc8adfec7..bf3d043c880 100644
--- a/srcpkgs/python-bottle/template
+++ b/srcpkgs/python3-bottle/template
@@ -1,13 +1,11 @@
-# Template file for 'python-bottle'
-pkgname=python-bottle
+# Template file for 'python3-bottle'
+pkgname=python3-bottle
 version=0.12.17
-revision=2
-archs=noarch
+revision=3
 wrksrc="bottle-${version}"
-build_style=python-module
-pycompile_module="bottle"
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Fast and simple WSGI-framework for small web-applications (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Fast and simple WSGI-framework for small web-applications (Python3)"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="http://bottlepy.org"
@@ -17,13 +15,3 @@ checksum=e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c
 post_install() {
 	vlicense LICENSE
 }
-
-python3-bottle_package() {
-	archs=noarch
-	pycompile_module="bottle"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense LICENSE
-	}
-}

From 8eead05f192a3faadfef0dcef2a466716ecbd950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:10:08 +0700
Subject: [PATCH 078/112] python-blinker: drop package

---
 srcpkgs/python-blinker/template  | 32 --------------------------------
 srcpkgs/python3-blinker          |  1 -
 srcpkgs/python3-blinker/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-blinker/template
 delete mode 120000 srcpkgs/python3-blinker
 create mode 100644 srcpkgs/python3-blinker/template

diff --git a/srcpkgs/python-blinker/template b/srcpkgs/python-blinker/template
deleted file mode 100644
index b6d1d63d19a..00000000000
--- a/srcpkgs/python-blinker/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-blinker'
-pkgname=python-blinker
-version=1.4
-revision=4
-archs=noarch
-wrksrc="blinker-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-pycompile_module="blinker"
-short_desc="Fast, simple object-to-object and broadcast signaling for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://pythonhosted.org/blinker/"
-license="MIT"
-distfiles="${PYPI_SITE}/b/blinker/blinker-${version}.tar.gz"
-checksum=471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-blinker_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="blinker"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-blinker b/srcpkgs/python3-blinker
deleted file mode 120000
index 221ddd65a4f..00000000000
--- a/srcpkgs/python3-blinker
+++ /dev/null
@@ -1 +0,0 @@
-python-blinker
\ No newline at end of file
diff --git a/srcpkgs/python3-blinker/template b/srcpkgs/python3-blinker/template
new file mode 100644
index 00000000000..4639d5c8d8b
--- /dev/null
+++ b/srcpkgs/python3-blinker/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-blinker'
+pkgname=python3-blinker
+version=1.4
+revision=5
+wrksrc="blinker-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Fast, simple object-to-object and broadcast signaling for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="http://pythonhosted.org/blinker/"
+distfiles="${PYPI_SITE}/b/blinker/blinker-${version}.tar.gz"
+checksum=471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6
+
+post_install() {
+	vlicense LICENSE
+}

From 37653ae36a8caefece56805dcd8df416046ad187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:10:36 +0700
Subject: [PATCH 079/112] python-blessings: drop package

---
 srcpkgs/python-blessings/template  | 31 ------------------------------
 srcpkgs/python3-blessings          |  1 -
 srcpkgs/python3-blessings/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-blessings/template
 delete mode 120000 srcpkgs/python3-blessings
 create mode 100644 srcpkgs/python3-blessings/template

diff --git a/srcpkgs/python-blessings/template b/srcpkgs/python-blessings/template
deleted file mode 100644
index baa4938c328..00000000000
--- a/srcpkgs/python-blessings/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-blessings'
-pkgname=python-blessings
-version=1.7
-revision=2
-archs=noarch
-wrksrc="blessings-${version}"
-build_style=python-module
-pycompile_module="blessings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="Wrapper around terminal coloring, styling, and positioning (Python2)"
-maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
-homepage="https://github.com/erikrose/blessings"
-license="MIT"
-distfiles="${PYPI_SITE}/b/blessings/blessings-${version}.tar.gz"
-checksum=98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-blessings_package() {
-	archs=noarch
-	depends="python3-six"
-	pycompile_module="blessings"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-blessings b/srcpkgs/python3-blessings
deleted file mode 120000
index bf277e1bbbc..00000000000
--- a/srcpkgs/python3-blessings
+++ /dev/null
@@ -1 +0,0 @@
-python-blessings
\ No newline at end of file
diff --git a/srcpkgs/python3-blessings/template b/srcpkgs/python3-blessings/template
new file mode 100644
index 00000000000..914f8922590
--- /dev/null
+++ b/srcpkgs/python3-blessings/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-blessings'
+pkgname=python3-blessings
+version=1.7
+revision=3
+wrksrc="blessings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Wrapper around terminal coloring, styling, and positioning (Python3)"
+maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
+license="MIT"
+homepage="https://github.com/erikrose/blessings"
+distfiles="${PYPI_SITE}/b/blessings/blessings-${version}.tar.gz"
+checksum=98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d
+
+post_install() {
+	vlicense LICENSE
+}

From b3b8c2d15840925f0c8f9367fe2728c1b08fe778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:11:10 +0700
Subject: [PATCH 080/112] python-backports_abc: drop package

---
 srcpkgs/python-backports_abc/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-backports_abc/template

diff --git a/srcpkgs/python-backports_abc/template b/srcpkgs/python-backports_abc/template
deleted file mode 100644
index 9d2e5565f02..00000000000
--- a/srcpkgs/python-backports_abc/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-backports_abc'
-pkgname=python-backports_abc
-version=0.5
-revision=1
-archs=noarch
-wrksrc="backports_abc-${version}"
-build_style=python2-module
-pycompile_module="backports_abc.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of collections.abc from Python 3.5"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/cython/backports_abc"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports_abc/backports_abc-${version}.tar.gz"
-checksum=033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde
-
-post_install() {
-	vlicense LICENSE
-}

From 51a5a5fc43b0daff3d075174eee50e34a6708db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:11:28 +0700
Subject: [PATCH 081/112] python-backports.ssl_match_hostname: drop package

---
 .../template                                  | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 srcpkgs/python-backports.ssl_match_hostname/template

diff --git a/srcpkgs/python-backports.ssl_match_hostname/template b/srcpkgs/python-backports.ssl_match_hostname/template
deleted file mode 100644
index dd4d76b47db..00000000000
--- a/srcpkgs/python-backports.ssl_match_hostname/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-backports.ssl_match_hostname'
-pkgname=python-backports.ssl_match_hostname
-version=3.5.0.1
-revision=3
-archs=noarch
-wrksrc="backports.ssl_match_hostname-${version}"
-build_style=python2-module
-pycompile_module="backports"
-hostmakedepends="python"
-depends="python-backports"
-short_desc="The ssl.match_hostname() function from Python 3.5"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/brandon/backports.ssl_match_hostname"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.ssl_match_hostname/backports.ssl_match_hostname-${version}.tar.gz"
-checksum=502ad98707319f4a51fa2ca1c677bd659008d27ded9f6380c79e8932e38dcdf2
-
-post_install() {
-	# namespace provided by python-backports package
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}

From a96d476bcf47d7f6d5fe1350e32781d1b2750630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:11:36 +0700
Subject: [PATCH 082/112] python-backports.shutil_get_terminal_size: drop
 package

---
 .../template                                  | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 srcpkgs/python-backports.shutil_get_terminal_size/template

diff --git a/srcpkgs/python-backports.shutil_get_terminal_size/template b/srcpkgs/python-backports.shutil_get_terminal_size/template
deleted file mode 100644
index 2e9a5af7f52..00000000000
--- a/srcpkgs/python-backports.shutil_get_terminal_size/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-backports.shutil_get_terminal_size'
-pkgname=python-backports.shutil_get_terminal_size
-version=1.0.0
-revision=1
-archs=noarch
-wrksrc="backports.shutil_get_terminal_size-${version}"
-build_style=python2-module
-pycompile_module="backports"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of the get_terminal_size function from Python 3.3's shutil"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/chrippa/backports.shutil_get_terminal_size"
-license="MIT"
-distfiles="${PYPI_SITE}/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-${version}.tar.gz"
-checksum=713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80
-
-post_install() {
-	# namespace provided by python-backports package
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}

From 15a7e8d43bce69ddfee950f5ee46e85f53fd6174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:12:01 +0700
Subject: [PATCH 083/112] python-Arrow: drop package

---
 srcpkgs/python-Arrow/template  | 24 ------------------------
 srcpkgs/python3-Arrow          |  1 -
 srcpkgs/python3-Arrow/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/python-Arrow/template
 delete mode 120000 srcpkgs/python3-Arrow
 create mode 100644 srcpkgs/python3-Arrow/template

diff --git a/srcpkgs/python-Arrow/template b/srcpkgs/python-Arrow/template
deleted file mode 100644
index a8c2e30c74b..00000000000
--- a/srcpkgs/python-Arrow/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-Arrow'
-pkgname=python-Arrow
-version=0.15.5
-revision=1
-archs=noarch
-wrksrc="arrow-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-dateutil python-backports.functools_lru_cache"
-short_desc="Better dates & times for Python (Python2)"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/crsmithdev/arrow"
-distfiles="${PYPI_SITE}/a/arrow/arrow-${version}.tar.gz"
-checksum=5390e464e2c5f76971b60ffa7ee29c598c7501a294bc9f5e6dadcb251a5d027b
-
-python3-Arrow_package() {
-	archs=noarch
-	depends="python3-dateutil"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-Arrow b/srcpkgs/python3-Arrow
deleted file mode 120000
index a4d5b422e3f..00000000000
--- a/srcpkgs/python3-Arrow
+++ /dev/null
@@ -1 +0,0 @@
-python-Arrow
\ No newline at end of file
diff --git a/srcpkgs/python3-Arrow/template b/srcpkgs/python3-Arrow/template
new file mode 100644
index 00000000000..a03ac3fd2a6
--- /dev/null
+++ b/srcpkgs/python3-Arrow/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-Arrow'
+pkgname=python3-Arrow
+version=0.15.5
+revision=2
+wrksrc="arrow-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-dateutil"
+short_desc="Better dates & times for Python (Python3)"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/crsmithdev/arrow"
+distfiles="${PYPI_SITE}/a/arrow/arrow-${version}.tar.gz"
+checksum=5390e464e2c5f76971b60ffa7ee29c598c7501a294bc9f5e6dadcb251a5d027b

From e9c827bf6691d88c02775cb2cfa1025f0cceeba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:13:00 +0700
Subject: [PATCH 084/112] python-backcall: drop package

---
 srcpkgs/python-backcall/template  | 26 --------------------------
 srcpkgs/python3-backcall          |  1 -
 srcpkgs/python3-backcall/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-backcall/template
 delete mode 120000 srcpkgs/python3-backcall
 create mode 100644 srcpkgs/python3-backcall/template

diff --git a/srcpkgs/python-backcall/template b/srcpkgs/python-backcall/template
deleted file mode 100644
index a55af727ab6..00000000000
--- a/srcpkgs/python-backcall/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-backcall'
-pkgname=python-backcall
-version=0.1.0
-revision=2
-archs=noarch
-wrksrc="backcall-${version}"
-build_style=python-module
-pycompile_module="backcall"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 module to write backwards compatible callback APIs"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/takluyver/backcall"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/b/backcall/backcall-${version}.tar.gz"
-checksum=38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4
-
-python3-backcall_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="backcall"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-backcall b/srcpkgs/python3-backcall
deleted file mode 120000
index 011083fc736..00000000000
--- a/srcpkgs/python3-backcall
+++ /dev/null
@@ -1 +0,0 @@
-python-backcall
\ No newline at end of file
diff --git a/srcpkgs/python3-backcall/template b/srcpkgs/python3-backcall/template
new file mode 100644
index 00000000000..4cfb47a897d
--- /dev/null
+++ b/srcpkgs/python3-backcall/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-backcall'
+pkgname=python3-backcall
+version=0.1.0
+revision=3
+wrksrc="backcall-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 module to write backwards compatible callback APIs"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/takluyver/backcall"
+distfiles="${PYPI_SITE}/b/backcall/backcall-${version}.tar.gz"
+checksum=38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4

From 078f423bbc2c78be796626a6964576ec0fc28e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:16:43 +0700
Subject: [PATCH 085/112] python3-backcall: update to 0.2.0.

---
 srcpkgs/python3-backcall/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-backcall/template b/srcpkgs/python3-backcall/template
index 4cfb47a897d..b08e321c8eb 100644
--- a/srcpkgs/python3-backcall/template
+++ b/srcpkgs/python3-backcall/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-backcall'
 pkgname=python3-backcall
-version=0.1.0
+version=0.2.0
 revision=3
 wrksrc="backcall-${version}"
 build_style=python3-module
@@ -11,4 +11,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/takluyver/backcall"
 distfiles="${PYPI_SITE}/b/backcall/backcall-${version}.tar.gz"
-checksum=38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4
+checksum=5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e
+
+post_install() {
+	vlicense LICENSE
+}

From 49accd5941b3891c611515b73539b32c86f0e1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:17:29 +0700
Subject: [PATCH 086/112] python-babelfish: drop package

---
 srcpkgs/python-babelfish/template  | 30 ------------------------------
 srcpkgs/python3-babelfish          |  1 -
 srcpkgs/python3-babelfish/template | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-babelfish/template
 delete mode 120000 srcpkgs/python3-babelfish
 create mode 100644 srcpkgs/python3-babelfish/template

diff --git a/srcpkgs/python-babelfish/template b/srcpkgs/python-babelfish/template
deleted file mode 100644
index 47d5bb176cc..00000000000
--- a/srcpkgs/python-babelfish/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-babelfish'
-pkgname=python-babelfish
-version=0.5.5
-revision=2
-archs=noarch
-wrksrc="babelfish-${version}"
-build_style=python-module
-pycompile_module="babelfish"
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="A module to work with countries and languages (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="BSD-3-Clause"
-homepage="https://github.com/Diaoul/babelfish"
-distfiles="${PYPI_SITE}/b/babelfish/babelfish-${version}.tar.gz"
-checksum=8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-babelfish_package() {
-	archs=noarch
-	pycompile_module="babelfish"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-babelfish b/srcpkgs/python3-babelfish
deleted file mode 120000
index eae373b49f6..00000000000
--- a/srcpkgs/python3-babelfish
+++ /dev/null
@@ -1 +0,0 @@
-python-babelfish
\ No newline at end of file
diff --git a/srcpkgs/python3-babelfish/template b/srcpkgs/python3-babelfish/template
new file mode 100644
index 00000000000..57dedc929f0
--- /dev/null
+++ b/srcpkgs/python3-babelfish/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-babelfish'
+pkgname=python3-babelfish
+version=0.5.5
+revision=3
+wrksrc="babelfish-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Module to work with countries and languages (Python3)"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="BSD-3-Clause"
+homepage="https://github.com/Diaoul/babelfish"
+distfiles="${PYPI_SITE}/b/babelfish/babelfish-${version}.tar.gz"
+checksum=8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104
+
+post_install() {
+	vlicense LICENSE
+}

From 626a936ffe20f1e501629f380cc9bdf1cc4465fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:24:00 +0700
Subject: [PATCH 087/112] backblaze-b2: drop noarch

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

diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index ef7fbca68b6..83d3b82b539 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,11 +1,9 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
 version=1.4.2
-revision=3
-archs=noarch
+revision=4
 wrksrc="b2-${version}"
 build_style=python3-module
-pycompile_module="b2"
 hostmakedepends="python3-setuptools"
 depends="python3-logfury python3-Arrow python3-requests python3-six
  python3-tqdm python-b2sdk"
@@ -43,6 +41,5 @@ do_check() {
 python-b2_package() {
 	depends="backblaze-b2>=${version}_${revision}"
 	build_style=meta
-	archs=noarch
 	short_desc+=" - transitional package"
 }

From 266a94fc5464c85a56d2102bb1cbea0f36152434 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 15 Sep 2020 16:59:03 +1000
Subject: [PATCH 088/112] python-b2sdk: remove noarch.

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

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 8c51c62d603..a499face476 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -2,11 +2,9 @@
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
 version=1.1.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="b2sdk-${version}"
 build_style=python3-module
-pycompile_module="b2sdk"
 hostmakedepends="python3-setuptools"
 depends="python3-logfury python3-Arrow python3-requests python3-six"
 checkdepends="python3-pytest $depends python3-dateutil python3-nose

From c6d42ee62f76bed4465f8797a8527350e881a48f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:27:13 +0700
Subject: [PATCH 089/112] python-pyacoustid: drop package

---
 srcpkgs/python-pyacoustid/template  | 32 -----------------------------
 srcpkgs/python3-pyacoustid          |  1 -
 srcpkgs/python3-pyacoustid/template | 19 +++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-pyacoustid/template
 delete mode 120000 srcpkgs/python3-pyacoustid
 create mode 100644 srcpkgs/python3-pyacoustid/template

diff --git a/srcpkgs/python-pyacoustid/template b/srcpkgs/python-pyacoustid/template
deleted file mode 100644
index d5b2d967f4e..00000000000
--- a/srcpkgs/python-pyacoustid/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyacoustid'
-pkgname=python-pyacoustid
-version=1.1.5
-revision=3
-archs=noarch
-wrksrc="pyacoustid-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="chromaprint python-audioread python-requests"
-pycompile_module="acoustid.py chromaprint.py"
-short_desc="Python2 bindings for Chromaprint and the Acoustid API"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/sampsyo/pyacoustid"
-license="MIT"
-distfiles="${PYPI_SITE}/p/pyacoustid/pyacoustid-${version}.tar.gz"
-checksum=efb6337a470c9301a108a539af7b775678ff67aa63944e9e04ce4216676cc777
-
-post_install() {
-	sed -n '0,/^$/p' acoustid.py > LICENSE
-	vlicense LICENSE
-}
-
-python3-pyacoustid_package() {
-	archs=noarch
-	pycompile_module="acoustid.py chromaprint.py"
-	depends="chromaprint python3-audioread python3-requests"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pyacoustid b/srcpkgs/python3-pyacoustid
deleted file mode 120000
index ffd753d7871..00000000000
--- a/srcpkgs/python3-pyacoustid
+++ /dev/null
@@ -1 +0,0 @@
-python-pyacoustid
\ No newline at end of file
diff --git a/srcpkgs/python3-pyacoustid/template b/srcpkgs/python3-pyacoustid/template
new file mode 100644
index 00000000000..eccab8db7c2
--- /dev/null
+++ b/srcpkgs/python3-pyacoustid/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyacoustid'
+pkgname=python3-pyacoustid
+version=1.1.5
+revision=4
+wrksrc="pyacoustid-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="chromaprint python3-audioread python3-requests"
+short_desc="Python3 bindings for Chromaprint and the Acoustid API"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/sampsyo/pyacoustid"
+distfiles="${PYPI_SITE}/p/pyacoustid/pyacoustid-${version}.tar.gz"
+checksum=efb6337a470c9301a108a539af7b775678ff67aa63944e9e04ce4216676cc777
+
+post_install() {
+	sed -n '0,/^$/p' acoustid.py > LICENSE
+	vlicense LICENSE
+}

From 4f3dfd1fab4e1c06d4bbdb82cdd0cc28daec8140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:27:54 +0700
Subject: [PATCH 090/112] python-pylastfp: drop package

---
 srcpkgs/python-pylastfp/template | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 srcpkgs/python-pylastfp/template

diff --git a/srcpkgs/python-pylastfp/template b/srcpkgs/python-pylastfp/template
deleted file mode 100644
index 6300e7c7ce4..00000000000
--- a/srcpkgs/python-pylastfp/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-pylastfp'
-pkgname=python-pylastfp
-version=0.6
-revision=4
-wrksrc="pylastfp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel libsamplerate-devel fftw-devel"
-depends="python-audioread"
-pycompile_module="lastfp"
-short_desc="Python bindings for Last.fm's acoustic fingerprinting (fplib)"
-maintainer="Steven R <dev@styez.com>"
-homepage="https://github.com/sampsyo/pylastfp"
-license="LGPL-3"
-distfiles="${PYPI_SITE}/p/pylastfp/pylastfp-${version}.tar.gz"
-checksum="5f9a32e532ab62e5663298b4b3b1db86f5466404f111ccaa9030c23ffee140f7"
-
-pre_build() {
-	mv lastmatch{.py,}
-	sed -i 's,lastmatch.py,lastmatch,g' lastmatch setup.py
-}

From 38052f2bf10b670b4d8e12926d9fb35c83acd2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:28:07 +0700
Subject: [PATCH 091/112] python-audioread: drop package

---
 srcpkgs/python-audioread/INSTALL.msg          |  4 ---
 srcpkgs/python3-audioread                     |  1 -
 .../INSTALL.msg}                              |  0
 .../template                                  | 27 +++++--------------
 4 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/python-audioread/INSTALL.msg
 delete mode 120000 srcpkgs/python3-audioread
 rename srcpkgs/{python-audioread/python3-audioread.INSTALL.msg => python3-audioread/INSTALL.msg} (100%)
 rename srcpkgs/{python-audioread => python3-audioread}/template (50%)

diff --git a/srcpkgs/python-audioread/INSTALL.msg b/srcpkgs/python-audioread/INSTALL.msg
deleted file mode 100644
index 895bea34926..00000000000
--- a/srcpkgs/python-audioread/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-To decode audio files the library supports different backends:
-- gstreamer via gst1-python
-- ffmpeg via its command-line interface
-- wave, aifc, and sunau files via Python standard library
diff --git a/srcpkgs/python3-audioread b/srcpkgs/python3-audioread
deleted file mode 120000
index 8983e80d1b1..00000000000
--- a/srcpkgs/python3-audioread
+++ /dev/null
@@ -1 +0,0 @@
-python-audioread
\ No newline at end of file
diff --git a/srcpkgs/python-audioread/python3-audioread.INSTALL.msg b/srcpkgs/python3-audioread/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-audioread/python3-audioread.INSTALL.msg
rename to srcpkgs/python3-audioread/INSTALL.msg
diff --git a/srcpkgs/python-audioread/template b/srcpkgs/python3-audioread/template
similarity index 50%
rename from srcpkgs/python-audioread/template
rename to srcpkgs/python3-audioread/template
index bc878d4b82d..41ff43ccf4a 100644
--- a/srcpkgs/python-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,14 +1,12 @@
-# Template file for 'python-audioread'
-pkgname=python-audioread
+# Template file for 'python3-audioread'
+pkgname=python3-audioread
 version=2.1.8
-revision=2
-archs=noarch
+revision=3
 wrksrc="audioread-${version}"
-build_style=python-module
-pycompile_module="audioread"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Multi-library, cross-platform audio decoding (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Multi-library, cross-platform audio decoding (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/sampsyo/audioread/"
@@ -19,14 +17,3 @@ post_install() {
 	sed -n '2,13p' decode.py > LICENSE
 	vlicense LICENSE
 }
-
-python3-audioread_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="audioread"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}

From 0035a79ffb28efa02d4a62d8c09980802d2a3ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:28:28 +0700
Subject: [PATCH 092/112] python-atspi: drop package

---
 srcpkgs/python-atspi/template | 17 -----------------
 srcpkgs/python-atspi/update   |  1 -
 2 files changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-atspi/template
 delete mode 100644 srcpkgs/python-atspi/update

diff --git a/srcpkgs/python-atspi/template b/srcpkgs/python-atspi/template
deleted file mode 100644
index 7505c32ad60..00000000000
--- a/srcpkgs/python-atspi/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-atspi'
-# Keep python3-atspi in sync
-pkgname=python-atspi
-version=2.38.0
-revision=1
-archs=noarch
-wrksrc="pyatspi-${version}"
-build_style=gnu-configure
-hostmakedepends="pkg-config python"
-makedepends="at-spi2-core-devel python-gobject-devel"
-depends="at-spi2-core python-gobject"
-short_desc="Python2 bindings for AT-SPI"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/pyatspi2"
-distfiles="${GNOME_SITE}/pyatspi/${version%.*}/pyatspi-${version}.tar.xz"
-checksum=ff809312fd0c2f61e191c181a1a638a30b579b91b682cfb5a05535a55265b43d
diff --git a/srcpkgs/python-atspi/update b/srcpkgs/python-atspi/update
deleted file mode 100644
index a2771db6a34..00000000000
--- a/srcpkgs/python-atspi/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyatspi

From 0970ae4b681a3d6e1032fc2a957db3460b159070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:29:14 +0700
Subject: [PATCH 093/112] python-asn1crypto: drop package

---
 srcpkgs/python-asn1crypto/template  | 31 -----------------------------
 srcpkgs/python3-asn1crypto          |  1 -
 srcpkgs/python3-asn1crypto/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-asn1crypto/template
 delete mode 120000 srcpkgs/python3-asn1crypto
 create mode 100644 srcpkgs/python3-asn1crypto/template

diff --git a/srcpkgs/python-asn1crypto/template b/srcpkgs/python-asn1crypto/template
deleted file mode 100644
index e7ffe7415fc..00000000000
--- a/srcpkgs/python-asn1crypto/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-asn1crypto'
-pkgname=python-asn1crypto
-version=0.24.0
-revision=2
-archs=noarch
-wrksrc="asn1crypto-${version}"
-build_style=python-module
-pycompile_module="asn1crypto"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 ASN.1 library with a focus on performance and a pythonic API"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/wbond/asn1crypto"
-license="MIT"
-distfiles="${PYPI_SITE}/a/asn1crypto/asn1crypto-${version}.tar.gz"
-checksum=9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-asn1crypto_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="asn1crypto"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-asn1crypto b/srcpkgs/python3-asn1crypto
deleted file mode 120000
index dd2d73e2a49..00000000000
--- a/srcpkgs/python3-asn1crypto
+++ /dev/null
@@ -1 +0,0 @@
-python-asn1crypto
\ No newline at end of file
diff --git a/srcpkgs/python3-asn1crypto/template b/srcpkgs/python3-asn1crypto/template
new file mode 100644
index 00000000000..d930b7b43ee
--- /dev/null
+++ b/srcpkgs/python3-asn1crypto/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-asn1crypto'
+pkgname=python3-asn1crypto
+version=0.24.0
+revision=3
+wrksrc="asn1crypto-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 ASN.1 library with a focus on performance and a pythonic API"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/wbond/asn1crypto"
+distfiles="${PYPI_SITE}/a/asn1crypto/asn1crypto-${version}.tar.gz"
+checksum=9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49
+
+post_install() {
+	vlicense LICENSE
+}

From 845f21282cc01267ad071cdfea5e3265527a92a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:29:40 +0700
Subject: [PATCH 094/112] python-arxiv2bib: drop package

---
 srcpkgs/python-arxiv2bib/template  | 35 ------------------------------
 srcpkgs/python3-arxiv2bib          |  1 -
 srcpkgs/python3-arxiv2bib/template | 20 +++++++++++++++++
 3 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-arxiv2bib/template
 delete mode 120000 srcpkgs/python3-arxiv2bib
 create mode 100644 srcpkgs/python3-arxiv2bib/template

diff --git a/srcpkgs/python-arxiv2bib/template b/srcpkgs/python-arxiv2bib/template
deleted file mode 100644
index 4f245755dcf..00000000000
--- a/srcpkgs/python-arxiv2bib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-arxiv2bib'
-pkgname=python-arxiv2bib
-version=1.0.8
-revision=3
-archs=noarch
-wrksrc="arxiv2bib-${version}"
-build_style=python-module
-pycompile_module="arxiv2bib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 package for getting arXiv data in BibTeX"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="http://nathangrigg.github.io/arxiv2bib"
-distfiles="${PYPI_SITE}/a/arxiv2bib/arxiv2bib-${version}.tar.gz"
-checksum=137608ed8aa4da6594350152964b9b0f46c6efcb07f8a4dfd50309c968b647a8
-alternatives="arxiv2bib:arxiv2bib:/usr/bin/arxiv2bib2"
-
-post_install() {
-	sed -n '3,28p' arxiv2bib.py > LICENSE
-	vlicense LICENSE
-}
-
-python3-arxiv2bib_package() {
-	archs=noarch
-	pycompile_module="arxiv2bib.py"
-	alternatives="arxiv2bib:arxiv2bib:/usr/bin/arxiv2bib3"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmove usr/bin/*3
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-arxiv2bib b/srcpkgs/python3-arxiv2bib
deleted file mode 120000
index 6dea3caf912..00000000000
--- a/srcpkgs/python3-arxiv2bib
+++ /dev/null
@@ -1 +0,0 @@
-python-arxiv2bib
\ No newline at end of file
diff --git a/srcpkgs/python3-arxiv2bib/template b/srcpkgs/python3-arxiv2bib/template
new file mode 100644
index 00000000000..74d3cc90961
--- /dev/null
+++ b/srcpkgs/python3-arxiv2bib/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-arxiv2bib'
+pkgname=python3-arxiv2bib
+version=1.0.8
+revision=4
+wrksrc="arxiv2bib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Python3 package for getting arXiv data in BibTeX"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="http://nathangrigg.github.io/arxiv2bib"
+distfiles="${PYPI_SITE}/a/arxiv2bib/arxiv2bib-${version}.tar.gz"
+checksum=137608ed8aa4da6594350152964b9b0f46c6efcb07f8a4dfd50309c968b647a8
+conflicts="python-arxiv2bib>=0"
+
+post_install() {
+	sed -n '3,28p' arxiv2bib.py > LICENSE
+	vlicense LICENSE
+}

From ff4e829fe1fa9d131787f2dec1fd63fefa2fc58b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:30:53 +0700
Subject: [PATCH 095/112] python-argh: drop package

---
 srcpkgs/python-argh/template  | 26 --------------------------
 srcpkgs/python3-argh          |  1 -
 srcpkgs/python3-argh/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-argh/template
 delete mode 120000 srcpkgs/python3-argh
 create mode 100644 srcpkgs/python3-argh/template

diff --git a/srcpkgs/python-argh/template b/srcpkgs/python-argh/template
deleted file mode 100644
index 656da441757..00000000000
--- a/srcpkgs/python-argh/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-argh'
-pkgname=python-argh
-version=0.26.2
-revision=2
-archs=noarch
-wrksrc="argh-${version}"
-build_style=python-module
-pycompile_module="argh"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="An unobtrusive argparse wrapper with natural syntax (Python2)"
-maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
-homepage="http://github.com/neithere/argh/"
-license="LGPL-3"
-distfiles="${PYPI_SITE}/a/argh/argh-${version}.tar.gz"
-checksum=e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65
-
-python3-argh_package() {
-	archs=noarch
-	pycompile_module="argh"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-argh b/srcpkgs/python3-argh
deleted file mode 120000
index d67f34c56ad..00000000000
--- a/srcpkgs/python3-argh
+++ /dev/null
@@ -1 +0,0 @@
-python-argh
\ No newline at end of file
diff --git a/srcpkgs/python3-argh/template b/srcpkgs/python3-argh/template
new file mode 100644
index 00000000000..51d4e18343d
--- /dev/null
+++ b/srcpkgs/python3-argh/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-argh'
+pkgname=python3-argh
+version=0.26.2
+revision=3
+wrksrc="argh-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Unobtrusive argparse wrapper with natural syntax (Python3)"
+maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
+license="LGPL-3.0-only"
+homepage="http://github.com/neithere/argh/"
+distfiles="${PYPI_SITE}/a/argh/argh-${version}.tar.gz"
+checksum=e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65

From b818742a3daf42acaaa0e294a449c9a7ca8a1b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:31:20 +0700
Subject: [PATCH 096/112] python-appdirs: drop package

---
 srcpkgs/python-appdirs/template  | 33 --------------------------------
 srcpkgs/python3-appdirs          |  1 -
 srcpkgs/python3-appdirs/template | 22 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-appdirs/template
 delete mode 120000 srcpkgs/python3-appdirs
 create mode 100644 srcpkgs/python3-appdirs/template

diff --git a/srcpkgs/python-appdirs/template b/srcpkgs/python-appdirs/template
deleted file mode 100644
index 68f8fa5cb4f..00000000000
--- a/srcpkgs/python-appdirs/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-appdirs'
-pkgname=python-appdirs
-version=1.4.4
-revision=1
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 module for determining appropriate platform-specific dirs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ActiveState/appdirs/"
-distfiles="${PYPI_SITE}/a/appdirs/appdirs-${version}.tar.gz"
-checksum=7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41
-
-do_check() {
-	python2 setup.py test
-}
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-appdirs_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-appdirs b/srcpkgs/python3-appdirs
deleted file mode 120000
index a759b105cdf..00000000000
--- a/srcpkgs/python3-appdirs
+++ /dev/null
@@ -1 +0,0 @@
-python-appdirs
\ No newline at end of file
diff --git a/srcpkgs/python3-appdirs/template b/srcpkgs/python3-appdirs/template
new file mode 100644
index 00000000000..20ba0a1dd26
--- /dev/null
+++ b/srcpkgs/python3-appdirs/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-appdirs'
+pkgname=python3-appdirs
+version=1.4.4
+revision=2
+wrksrc="appdirs-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 module for determining appropriate platform-specific dirs"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ActiveState/appdirs/"
+distfiles="${PYPI_SITE}/a/appdirs/appdirs-${version}.tar.gz"
+checksum=7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41
+
+do_check() {
+	python2 setup.py test
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 2b55f0392752a65b076023b4e8fb9b5da5458fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:31:42 +0700
Subject: [PATCH 097/112] python-ansicolor: drop package

---
 srcpkgs/python-ansicolor/template  | 26 --------------------------
 srcpkgs/python3-ansicolor          |  1 -
 srcpkgs/python3-ansicolor/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-ansicolor/template
 delete mode 120000 srcpkgs/python3-ansicolor
 create mode 100644 srcpkgs/python3-ansicolor/template

diff --git a/srcpkgs/python-ansicolor/template b/srcpkgs/python-ansicolor/template
deleted file mode 100644
index 3663a82f0cc..00000000000
--- a/srcpkgs/python-ansicolor/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-ansicolor'
-pkgname=python-ansicolor
-version=0.2.6
-revision=3
-archs=noarch
-wrksrc="ansicolor-${version}"
-build_style=python-module
-pycompile_module="ansicolor"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Library to produce ansi color output (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="Apache-2.0"
-homepage="https://github.com/numerodix/ansicolor"
-distfiles="${PYPI_SITE}/a/ansicolor/ansicolor-${version}.tar.gz"
-checksum=d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d
-
-python3-ansicolor_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="ansicolor"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-ansicolor b/srcpkgs/python3-ansicolor
deleted file mode 120000
index 9a095f0d4cf..00000000000
--- a/srcpkgs/python3-ansicolor
+++ /dev/null
@@ -1 +0,0 @@
-python-ansicolor
\ No newline at end of file
diff --git a/srcpkgs/python3-ansicolor/template b/srcpkgs/python3-ansicolor/template
new file mode 100644
index 00000000000..c60eea83303
--- /dev/null
+++ b/srcpkgs/python3-ansicolor/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ansicolor'
+pkgname=python3-ansicolor
+version=0.2.6
+revision=4
+wrksrc="ansicolor-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Library to produce ansi color output (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="Apache-2.0"
+homepage="https://github.com/numerodix/ansicolor"
+distfiles="${PYPI_SITE}/a/ansicolor/ansicolor-${version}.tar.gz"
+checksum=d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d

From 8e4e59133e1ee1eb705340d9095bb20197a0bc84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:32:06 +0700
Subject: [PATCH 098/112] python-alabaster: drop package

---
 srcpkgs/python-alabaster/template  | 31 ------------------------------
 srcpkgs/python3-alabaster          |  1 -
 srcpkgs/python3-alabaster/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-alabaster/template
 delete mode 120000 srcpkgs/python3-alabaster
 create mode 100644 srcpkgs/python3-alabaster/template

diff --git a/srcpkgs/python-alabaster/template b/srcpkgs/python-alabaster/template
deleted file mode 100644
index b33009d5efb..00000000000
--- a/srcpkgs/python-alabaster/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-alabaster'
-pkgname=python-alabaster
-version=0.7.12
-revision=2
-archs=noarch
-wrksrc="alabaster-${version}"
-build_style=python-module
-pycompile_module="alabaster"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Configurable sidebar-enabled Sphinx theme (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://alabaster.readthedocs.io/"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/a/alabaster/alabaster-${version}.tar.gz"
-checksum=a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-alabaster_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="alabaster"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-alabaster b/srcpkgs/python3-alabaster
deleted file mode 120000
index 8efee5973a1..00000000000
--- a/srcpkgs/python3-alabaster
+++ /dev/null
@@ -1 +0,0 @@
-python-alabaster
\ No newline at end of file
diff --git a/srcpkgs/python3-alabaster/template b/srcpkgs/python3-alabaster/template
new file mode 100644
index 00000000000..736913e821e
--- /dev/null
+++ b/srcpkgs/python3-alabaster/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-alabaster'
+pkgname=python3-alabaster
+version=0.7.12
+revision=3
+wrksrc="alabaster-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Configurable sidebar-enabled Sphinx theme (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://alabaster.readthedocs.io/"
+distfiles="${PYPI_SITE}/a/alabaster/alabaster-${version}.tar.gz"
+checksum=a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02
+
+post_install() {
+	vlicense LICENSE
+}

From d4dede94c55139cc3515d92a6e32fd7372dab6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:32:25 +0700
Subject: [PATCH 099/112] python-aalib: drop package

---
 srcpkgs/python-aalib/template  | 31 -------------------------------
 srcpkgs/python3-aalib          |  1 -
 srcpkgs/python3-aalib/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-aalib/template
 delete mode 120000 srcpkgs/python3-aalib
 create mode 100644 srcpkgs/python3-aalib/template

diff --git a/srcpkgs/python-aalib/template b/srcpkgs/python-aalib/template
deleted file mode 100644
index f9621a9c8dc..00000000000
--- a/srcpkgs/python-aalib/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-aalib'
-pkgname=python-aalib
-version=0.3.2
-revision=2
-build_style=python-module
-pycompile_module="aalib.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="aalib python"
-short_desc="Python2 interface to AAlib, an ASCII art library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://jwilk.net/software/python-aalib"
-distfiles="${PYPI_SITE}/p/python-aalib/python-aalib-${version}.tar.gz"
-checksum=c39071629e7962dcd926faf0135dc73e2a8eb5db9a53bc2ebe5965f8c39165a2
-archs=noarch
-
-post_install() {
-	sed -n '3,21p' < setup.py > LICENSE
-	vlicense LICENSE
-}
-
-python3-aalib_package() {
-	archs=noarch
-	pycompile_module="aalib.py"
-	depends="aalib python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-aalib b/srcpkgs/python3-aalib
deleted file mode 120000
index 854bacf6f64..00000000000
--- a/srcpkgs/python3-aalib
+++ /dev/null
@@ -1 +0,0 @@
-python-aalib
\ No newline at end of file
diff --git a/srcpkgs/python3-aalib/template b/srcpkgs/python3-aalib/template
new file mode 100644
index 00000000000..3dad9f20994
--- /dev/null
+++ b/srcpkgs/python3-aalib/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-aalib'
+pkgname=python3-aalib
+version=0.3.2
+revision=3
+wrksrc=python-aalib-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="aalib python3"
+short_desc="Python3 interface to AAlib, an ASCII art library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="http://jwilk.net/software/python-aalib"
+distfiles="${PYPI_SITE}/p/python-aalib/python-aalib-${version}.tar.gz"
+checksum=c39071629e7962dcd926faf0135dc73e2a8eb5db9a53bc2ebe5965f8c39165a2
+
+post_install() {
+	sed -n '3,21p' < setup.py > LICENSE
+	vlicense LICENSE
+}

From a0602179cce5331bc760aeaed960335b2d8e13b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:32:54 +0700
Subject: [PATCH 100/112] python-Yapsy: drop package

---
 srcpkgs/python-Yapsy/template  | 31 -------------------------------
 srcpkgs/python3-Yapsy          |  1 -
 srcpkgs/python3-Yapsy/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-Yapsy/template
 delete mode 120000 srcpkgs/python3-Yapsy
 create mode 100644 srcpkgs/python3-Yapsy/template

diff --git a/srcpkgs/python-Yapsy/template b/srcpkgs/python-Yapsy/template
deleted file mode 100644
index 5ad8b234f5d..00000000000
--- a/srcpkgs/python-Yapsy/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-Yapsy'
-pkgname=python-Yapsy
-version=1.12.2
-revision=2
-archs=noarch
-wrksrc="Yapsy-${version}"
-build_style=python-module
-pycompile_module="yapsy"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Yet another plugin system"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-Clause"
-homepage="http://yapsy.sourceforge.net/"
-distfiles="${PYPI_SITE}/Y/Yapsy/Yapsy-${version}.tar.gz"
-checksum=d8113d9f9c74eacf65b4663c9c037d278c9cb273b5eee5f0e1803baeedb23f8b
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-Yapsy_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="yapsy"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-Yapsy b/srcpkgs/python3-Yapsy
deleted file mode 120000
index 4345c734003..00000000000
--- a/srcpkgs/python3-Yapsy
+++ /dev/null
@@ -1 +0,0 @@
-python-Yapsy
\ No newline at end of file
diff --git a/srcpkgs/python3-Yapsy/template b/srcpkgs/python3-Yapsy/template
new file mode 100644
index 00000000000..38b88be2a1a
--- /dev/null
+++ b/srcpkgs/python3-Yapsy/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Yapsy'
+pkgname=python3-Yapsy
+version=1.12.2
+revision=3
+wrksrc="Yapsy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Yet another plugin system"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-2-Clause"
+homepage="http://yapsy.sourceforge.net/"
+distfiles="${PYPI_SITE}/Y/Yapsy/Yapsy-${version}.tar.gz"
+checksum=d8113d9f9c74eacf65b4663c9c037d278c9cb273b5eee5f0e1803baeedb23f8b
+
+post_install() {
+	vlicense LICENSE.txt
+}

From ef65e89c5d30c820cd14ee0cc641faee356bef68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:33:25 +0700
Subject: [PATCH 101/112] python-Whoosh: drop package

---
 srcpkgs/python-Whoosh/template  | 32 --------------------------------
 srcpkgs/python3-Whoosh          |  1 -
 srcpkgs/python3-Whoosh/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-Whoosh/template
 delete mode 120000 srcpkgs/python3-Whoosh
 create mode 100644 srcpkgs/python3-Whoosh/template

diff --git a/srcpkgs/python-Whoosh/template b/srcpkgs/python-Whoosh/template
deleted file mode 100644
index 66856b206a7..00000000000
--- a/srcpkgs/python-Whoosh/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-whoosh'
-pkgname=python-Whoosh
-version=2.7.4
-revision=2
-wrksrc="Whoosh-${version}"
-archs=noarch
-build_style=python-module
-pycompile_module="whoosh"
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Full-text indexing and searching library (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="BSD-2-Clause"
-homepage="https://bitbucket.org/mchaput/whoosh/wiki/Home"
-distfiles="${PYPI_SITE}/W/Whoosh/Whoosh-${version}.tar.gz"
-checksum=7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83
-
-post_install() {
-	vlicense LICENSE.txt LICENSE
-}
-
-python3-Whoosh_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	pycompile_module="whoosh"
-	archs=noarch
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Whoosh b/srcpkgs/python3-Whoosh
deleted file mode 120000
index 1d62914385c..00000000000
--- a/srcpkgs/python3-Whoosh
+++ /dev/null
@@ -1 +0,0 @@
-python-Whoosh
\ No newline at end of file
diff --git a/srcpkgs/python3-Whoosh/template b/srcpkgs/python3-Whoosh/template
new file mode 100644
index 00000000000..aa10143f91c
--- /dev/null
+++ b/srcpkgs/python3-Whoosh/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Whoosh'
+pkgname=python3-Whoosh
+version=2.7.4
+revision=3
+wrksrc="Whoosh-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Full-text indexing and searching library (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="BSD-2-Clause"
+homepage="https://bitbucket.org/mchaput/whoosh/wiki/Home"
+distfiles="${PYPI_SITE}/W/Whoosh/Whoosh-${version}.tar.gz"
+checksum=7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From 48fee0ae0f4f88fda7d0a92b5bc0b6b7c22a18a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:33:49 +0700
Subject: [PATCH 102/112] python-WTForms: drop package

---
 srcpkgs/python-WTForms/template  | 32 --------------------------------
 srcpkgs/python3-WTForms          |  1 -
 srcpkgs/python3-WTForms/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-WTForms/template
 delete mode 120000 srcpkgs/python3-WTForms
 create mode 100644 srcpkgs/python3-WTForms/template

diff --git a/srcpkgs/python-WTForms/template b/srcpkgs/python-WTForms/template
deleted file mode 100644
index 33f16940cb8..00000000000
--- a/srcpkgs/python-WTForms/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-WTForms'
-pkgname=python-WTForms
-version=2.2.1
-revision=2
-archs=noarch
-wrksrc="WTForms-${version}"
-build_style=python-module
-pycompile_module="wtforms"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Forms validation and rendering library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://wtforms.simplecodes.com/"
-#changelog="https://raw.githubusercontent.com/wtforms/wtforms/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/W/WTForms/WTForms-${version}.tar.gz"
-checksum=0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61
-
-post_install() {
-	vlicense LICENSE.rst LICENSE
-}
-
-python3-WTForms_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="wtforms"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst LICENSE
-	}
-}
diff --git a/srcpkgs/python3-WTForms b/srcpkgs/python3-WTForms
deleted file mode 120000
index 64195c4de29..00000000000
--- a/srcpkgs/python3-WTForms
+++ /dev/null
@@ -1 +0,0 @@
-python-WTForms
\ No newline at end of file
diff --git a/srcpkgs/python3-WTForms/template b/srcpkgs/python3-WTForms/template
new file mode 100644
index 00000000000..6e2d13e84b3
--- /dev/null
+++ b/srcpkgs/python3-WTForms/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-WTForms'
+pkgname=python3-WTForms
+version=2.2.1
+revision=3
+wrksrc="WTForms-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Forms validation and rendering library for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://wtforms.simplecodes.com/"
+#changelog="https://raw.githubusercontent.com/wtforms/wtforms/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/W/WTForms/WTForms-${version}.tar.gz"
+checksum=0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61
+
+post_install() {
+	vlicense LICENSE.rst LICENSE
+}

From ab1f420ca2c9f92c42ccb73d857df4416d1bfdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:34:08 +0700
Subject: [PATCH 103/112] python-Unidecode: drop package

---
 srcpkgs/python-Unidecode/template  | 33 ------------------------------
 srcpkgs/python3-Unidecode          |  1 -
 srcpkgs/python3-Unidecode/template | 19 +++++++++++++++++
 3 files changed, 19 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-Unidecode/template
 delete mode 120000 srcpkgs/python3-Unidecode
 create mode 100644 srcpkgs/python3-Unidecode/template

diff --git a/srcpkgs/python-Unidecode/template b/srcpkgs/python-Unidecode/template
deleted file mode 100644
index 444eb1427d6..00000000000
--- a/srcpkgs/python-Unidecode/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-Unidecode'
-pkgname=python-Unidecode
-version=1.1.1
-revision=2
-archs=noarch
-wrksrc="Unidecode-${version}"
-build_style=python-module
-pycompile_module="unidecode"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 ASCII transliterations of Unicode text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://pypi.org/project/Unidecode/"
-distfiles="${PYPI_SITE}/U/Unidecode/Unidecode-${version}.tar.gz"
-checksum=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
-alternatives="unidecode:unidecode:/usr/bin/unidecode2"
-
-do_check() {
-	python3 setup.py test
-}
-
-python3-Unidecode_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	pycompile_module="unidecode"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="unidecode:unidecode:/usr/bin/unidecode3"
-	pkg_install() {
-		vmove usr/bin/unidecode3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-Unidecode b/srcpkgs/python3-Unidecode
deleted file mode 120000
index 39579f9fb55..00000000000
--- a/srcpkgs/python3-Unidecode
+++ /dev/null
@@ -1 +0,0 @@
-python-Unidecode
\ No newline at end of file
diff --git a/srcpkgs/python3-Unidecode/template b/srcpkgs/python3-Unidecode/template
new file mode 100644
index 00000000000..c901fe45e05
--- /dev/null
+++ b/srcpkgs/python3-Unidecode/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Unidecode'
+pkgname=python3-Unidecode
+version=1.1.1
+revision=3
+wrksrc="Unidecode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Python3 ASCII transliterations of Unicode text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/Unidecode/"
+distfiles="${PYPI_SITE}/U/Unidecode/Unidecode-${version}.tar.gz"
+checksum=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
+conflicts="python-Unidecode>=0"
+
+do_check() {
+	python3 setup.py test
+}

From f013358074025d73acabf43c150ee203683e7916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:34:39 +0700
Subject: [PATCH 104/112] python-PyOpenGL-accelerate: drop package

---
 srcpkgs/python-PyOpenGL-accelerate/template   | 28 -------------------
 srcpkgs/python3-PyOpenGL-accelerate           |  1 -
 srcpkgs/python3-PyOpenGL-accelerate/template  | 19 +++++++++++++
 .../update                                    |  0
 4 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/python-PyOpenGL-accelerate/template
 delete mode 120000 srcpkgs/python3-PyOpenGL-accelerate
 create mode 100644 srcpkgs/python3-PyOpenGL-accelerate/template
 rename srcpkgs/{python-PyOpenGL-accelerate => python3-PyOpenGL-accelerate}/update (100%)

diff --git a/srcpkgs/python-PyOpenGL-accelerate/template b/srcpkgs/python-PyOpenGL-accelerate/template
deleted file mode 100644
index e739e0d45de..00000000000
--- a/srcpkgs/python-PyOpenGL-accelerate/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-PyOpenGL-accelerate'
-pkgname=python-PyOpenGL-accelerate
-version=3.1.5
-revision=1
-wrksrc="PyOpenGL-accelerate-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel python-numpy python3-numpy"
-depends="python-numpy"
-short_desc="Acceleration code for PyOpenGL (Python2)"
-maintainer="Alain Kalker <a.c.kalker@gmail.com>"
-license="BSD-3-Clause"
-homepage="http://pyopengl.sourceforge.net/"
-distfiles="${PYPI_SITE}/P/PyOpenGL-accelerate/PyOpenGL-accelerate-${version}.tar.gz"
-checksum=12e5518b0216a478527c7ce5ddce623c3d0517adeb87226da767772e8b7f2f06
-
-post_install() {
-	vlicense license.txt LICENSE
-}
-
-python3-PyOpenGL-accelerate_package() {
-	depends="python3-numpy"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense license.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-PyOpenGL-accelerate b/srcpkgs/python3-PyOpenGL-accelerate
deleted file mode 120000
index f118fec6887..00000000000
--- a/srcpkgs/python3-PyOpenGL-accelerate
+++ /dev/null
@@ -1 +0,0 @@
-python-PyOpenGL-accelerate
\ No newline at end of file
diff --git a/srcpkgs/python3-PyOpenGL-accelerate/template b/srcpkgs/python3-PyOpenGL-accelerate/template
new file mode 100644
index 00000000000..9ddf09f5f1d
--- /dev/null
+++ b/srcpkgs/python3-PyOpenGL-accelerate/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-PyOpenGL-accelerate'
+pkgname=python3-PyOpenGL-accelerate
+version=3.1.5
+revision=1
+wrksrc="PyOpenGL-accelerate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel python3-numpy"
+depends="python3-numpy"
+short_desc="Acceleration code for PyOpenGL (Python3)"
+maintainer="Alain Kalker <a.c.kalker@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://pyopengl.sourceforge.net/"
+distfiles="${PYPI_SITE}/P/PyOpenGL-accelerate/PyOpenGL-accelerate-${version}.tar.gz"
+checksum=12e5518b0216a478527c7ce5ddce623c3d0517adeb87226da767772e8b7f2f06
+
+post_install() {
+	vlicense license.txt LICENSE
+}
diff --git a/srcpkgs/python-PyOpenGL-accelerate/update b/srcpkgs/python3-PyOpenGL-accelerate/update
similarity index 100%
rename from srcpkgs/python-PyOpenGL-accelerate/update
rename to srcpkgs/python3-PyOpenGL-accelerate/update

From e4a35cccc624ce70586716c8b0e63cbadf4fa1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:35:02 +0700
Subject: [PATCH 105/112] python-pyqtgraph: drop package

---
 srcpkgs/python-pyqtgraph/template             | 32 -------------------
 srcpkgs/python3-pyqtgraph                     |  1 -
 srcpkgs/python3-pyqtgraph/template            | 19 +++++++++++
 .../update                                    |  0
 4 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-pyqtgraph/template
 delete mode 120000 srcpkgs/python3-pyqtgraph
 create mode 100644 srcpkgs/python3-pyqtgraph/template
 rename srcpkgs/{python-pyqtgraph => python3-pyqtgraph}/update (100%)

diff --git a/srcpkgs/python-pyqtgraph/template b/srcpkgs/python-pyqtgraph/template
deleted file mode 100644
index 1bea9c2ffdf..00000000000
--- a/srcpkgs/python-pyqtgraph/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyqtgraph'
-pkgname=python-pyqtgraph
-version=0.10.0
-revision=4
-archs=noarch
-wrksrc="${pkgname#*-}-${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="pyqtgraph"
-make_install_args="--no-compile"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-PyQt5 python-numpy python-PyOpenGL"
-short_desc="Python2 scientific graphics and GUI library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="http://www.pyqtgraph.org/"
-distfiles="https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-${version}.tar.gz"
-checksum=4c851deec81c1dd1ecb4468ff6d5b035349b167cc1b4e4bb724b4b410945d20b
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-pyqtgraph_package() {
-	archs=noarch
-	depends="python3-PyQt5 python3-numpy python3-PyOpenGL"
-	pycompile_module="pyqtgraph"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-pyqtgraph b/srcpkgs/python3-pyqtgraph
deleted file mode 120000
index 8530196159a..00000000000
--- a/srcpkgs/python3-pyqtgraph
+++ /dev/null
@@ -1 +0,0 @@
-python-pyqtgraph
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template
new file mode 100644
index 00000000000..6fb09733e51
--- /dev/null
+++ b/srcpkgs/python3-pyqtgraph/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyqtgraph'
+pkgname=python3-pyqtgraph
+version=0.10.0
+revision=5
+wrksrc="${pkgname#*-}-${pkgname#*-}-${version}"
+build_style=python3-module
+make_install_args="--no-compile"
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-numpy python3-PyOpenGL"
+short_desc="Python3 scientific graphics and GUI library"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="http://www.pyqtgraph.org/"
+distfiles="https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-${version}.tar.gz"
+checksum=4c851deec81c1dd1ecb4468ff6d5b035349b167cc1b4e4bb724b4b410945d20b
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-pyqtgraph/update b/srcpkgs/python3-pyqtgraph/update
similarity index 100%
rename from srcpkgs/python-pyqtgraph/update
rename to srcpkgs/python3-pyqtgraph/update

From df1973657f4f060e112b470cd6c1c037b098a3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:35:16 +0700
Subject: [PATCH 106/112] python-PyOpenGL: drop package

---
 srcpkgs/python-PyOpenGL/template              | 29 -------------------
 srcpkgs/python3-PyOpenGL                      |  1 -
 srcpkgs/python3-PyOpenGL/template             | 18 ++++++++++++
 .../update                                    |  0
 4 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-PyOpenGL/template
 delete mode 120000 srcpkgs/python3-PyOpenGL
 create mode 100644 srcpkgs/python3-PyOpenGL/template
 rename srcpkgs/{python-PyOpenGL => python3-PyOpenGL}/update (100%)

diff --git a/srcpkgs/python-PyOpenGL/template b/srcpkgs/python-PyOpenGL/template
deleted file mode 100644
index 79709575673..00000000000
--- a/srcpkgs/python-PyOpenGL/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-PyOpenGL'
-pkgname=python-PyOpenGL
-version=3.1.5
-revision=1
-archs=noarch
-wrksrc="PyOpenGL-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Standard OpenGL bindings for Python2"
-maintainer="Alain Kalker <a.c.kalker@gmail.com>"
-license="BSD-3-Clause"
-homepage="http://pyopengl.sourceforge.net/"
-distfiles="${PYPI_SITE}/P/PyOpenGL/PyOpenGL-${version}.tar.gz"
-checksum=4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424
-
-post_install() {
-	vlicense license.txt LICENSE
-}
-
-python3-PyOpenGL_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense license.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-PyOpenGL b/srcpkgs/python3-PyOpenGL
deleted file mode 120000
index 51dba8e988f..00000000000
--- a/srcpkgs/python3-PyOpenGL
+++ /dev/null
@@ -1 +0,0 @@
-python-PyOpenGL
\ No newline at end of file
diff --git a/srcpkgs/python3-PyOpenGL/template b/srcpkgs/python3-PyOpenGL/template
new file mode 100644
index 00000000000..1a2f0e1500e
--- /dev/null
+++ b/srcpkgs/python3-PyOpenGL/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-PyOpenGL'
+pkgname=python3-PyOpenGL
+version=3.1.5
+revision=2
+wrksrc="PyOpenGL-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Standard OpenGL bindings for Python3"
+maintainer="Alain Kalker <a.c.kalker@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://pyopengl.sourceforge.net/"
+distfiles="${PYPI_SITE}/P/PyOpenGL/PyOpenGL-${version}.tar.gz"
+checksum=4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424
+
+post_install() {
+	vlicense license.txt LICENSE
+}
diff --git a/srcpkgs/python-PyOpenGL/update b/srcpkgs/python3-PyOpenGL/update
similarity index 100%
rename from srcpkgs/python-PyOpenGL/update
rename to srcpkgs/python3-PyOpenGL/update

From 350d36bd4c4e3768e3695f7013457979cdb42583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:36:09 +0700
Subject: [PATCH 107/112] python-MiniMock: drop package

---
 srcpkgs/python-MiniMock/template  | 31 -------------------------------
 srcpkgs/python3-MiniMock          |  1 -
 srcpkgs/python3-MiniMock/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-MiniMock/template
 delete mode 120000 srcpkgs/python3-MiniMock
 create mode 100644 srcpkgs/python3-MiniMock/template

diff --git a/srcpkgs/python-MiniMock/template b/srcpkgs/python-MiniMock/template
deleted file mode 100644
index 8b8c4f5f1e6..00000000000
--- a/srcpkgs/python-MiniMock/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-MiniMock'
-pkgname=python-MiniMock
-version=1.2.8
-revision=3
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="minimock.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="The simplest possible mock library in Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pypi.org/project/MiniMock/"
-distfiles="${PYPI_SITE}/M/MiniMock/MiniMock-${version}.tar.gz"
-checksum=5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c
-
-post_install() {
-	vlicense docs/license.txt
-}
-
-python3-MiniMock_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="minimock.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense docs/license.txt
-	}
-}
diff --git a/srcpkgs/python3-MiniMock b/srcpkgs/python3-MiniMock
deleted file mode 120000
index 8bdbc383b7f..00000000000
--- a/srcpkgs/python3-MiniMock
+++ /dev/null
@@ -1 +0,0 @@
-python-MiniMock
\ No newline at end of file
diff --git a/srcpkgs/python3-MiniMock/template b/srcpkgs/python3-MiniMock/template
new file mode 100644
index 00000000000..58b44884944
--- /dev/null
+++ b/srcpkgs/python3-MiniMock/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-MiniMock'
+pkgname=python3-MiniMock
+version=1.2.8
+revision=4
+wrksrc="MiniMock-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple possible mock library in Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pypi.org/project/MiniMock/"
+distfiles="${PYPI_SITE}/M/MiniMock/MiniMock-${version}.tar.gz"
+checksum=5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c
+
+post_install() {
+	vlicense docs/license.txt
+}

From b39fc131256d2710e974657830983de2bf8dc0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:36:29 +0700
Subject: [PATCH 108/112] python-Markups: drop package

---
 srcpkgs/python3-Markups                       |  1 -
 .../template                                  | 25 ++++++-------------
 2 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-Markups
 rename srcpkgs/{python-Markups => python3-Markups}/template (55%)

diff --git a/srcpkgs/python3-Markups b/srcpkgs/python3-Markups
deleted file mode 120000
index 1d5fbeec9ce..00000000000
--- a/srcpkgs/python3-Markups
+++ /dev/null
@@ -1 +0,0 @@
-python-Markups
\ No newline at end of file
diff --git a/srcpkgs/python-Markups/template b/srcpkgs/python3-Markups/template
similarity index 55%
rename from srcpkgs/python-Markups/template
rename to srcpkgs/python3-Markups/template
index 1eb15b49301..b72e25c6f64 100644
--- a/srcpkgs/python-Markups/template
+++ b/srcpkgs/python3-Markups/template
@@ -1,13 +1,12 @@
-# Template file for 'python-Markups'
-pkgname=python-Markups
+# Template file for 'python3-Markups'
+pkgname=python3-Markups
 version=3.0.0
-revision=3
-archs=noarch
+revision=4
 wrksrc="Markups-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Wrapper around the various text markup languages (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-markdown-math"
+short_desc="Wrapper around the various text markup languages (Python3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mitya57/pymarkups"
@@ -18,13 +17,3 @@ checksum=1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39
 post_install() {
 	vlicense LICENSE
 }
-
-python3-Markups_package() {
-	archs=noarch
-	depends="python3 python3-markdown-math"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vlicense LICENSE
-		vmove usr/lib/python3*
-	}
-}

From ee0ec7e378ec036b420959dc4f5776df46d6dc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:38:34 +0700
Subject: [PATCH 109/112] python-Mako: drop package

---
 srcpkgs/python-Mako/template  | 37 -----------------------------------
 srcpkgs/python3-Mako          |  1 -
 srcpkgs/python3-Mako/template | 24 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-Mako/template
 delete mode 120000 srcpkgs/python3-Mako
 create mode 100644 srcpkgs/python3-Mako/template

diff --git a/srcpkgs/python-Mako/template b/srcpkgs/python-Mako/template
deleted file mode 100644
index 8cfa6722149..00000000000
--- a/srcpkgs/python-Mako/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Mako'
-pkgname=python-Mako
-version=1.1.3
-revision=1
-archs=noarch
-wrksrc="Mako-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-MarkupSafe"
-checkdepends="tox"
-short_desc="Hyperfast and lightweight templating for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.makotemplates.org/"
-distfiles="${PYPI_SITE}/M/Mako/Mako-${version}.tar.gz"
-checksum=8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27
-alternatives="mako:mako-render:/usr/bin/mako-render2"
-
-do_check() {
-	tox -e py27,py${py3_ver/./}
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Mako_package() {
-	archs=noarch
-	depends="python3-setuptools python3-MarkupSafe"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="mako:mako-render:/usr/bin/mako-render3"
-	pkg_install() {
-		vmove usr/bin/mako-render3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Mako b/srcpkgs/python3-Mako
deleted file mode 120000
index 3b00bf4b5bf..00000000000
--- a/srcpkgs/python3-Mako
+++ /dev/null
@@ -1 +0,0 @@
-python-Mako
\ No newline at end of file
diff --git a/srcpkgs/python3-Mako/template b/srcpkgs/python3-Mako/template
new file mode 100644
index 00000000000..3312217d823
--- /dev/null
+++ b/srcpkgs/python3-Mako/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-Mako'
+pkgname=python3-Mako
+version=1.1.3
+revision=2
+wrksrc="Mako-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-MarkupSafe"
+checkdepends="tox"
+short_desc="Hyperfast and lightweight templating for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.makotemplates.org/"
+distfiles="${PYPI_SITE}/M/Mako/Mako-${version}.tar.gz"
+checksum=8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27
+conflicts="python-Mako>=0"
+
+do_check() {
+	tox -e py27,py${py3_ver/./}
+}
+
+post_install() {
+	vlicense LICENSE
+}

From ba521af3b820dac477797817fb77655b4dcd7df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:38:50 +0700
Subject: [PATCH 110/112] python-IPy: drop package

---
 srcpkgs/python-IPy/template  | 31 -------------------------------
 srcpkgs/python3-IPy          |  1 -
 srcpkgs/python3-IPy/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-IPy/template
 delete mode 120000 srcpkgs/python3-IPy
 create mode 100644 srcpkgs/python3-IPy/template

diff --git a/srcpkgs/python-IPy/template b/srcpkgs/python-IPy/template
deleted file mode 100644
index aaae9fcd002..00000000000
--- a/srcpkgs/python-IPy/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-IPy'
-pkgname=python-IPy
-version=1.00
-revision=2
-archs=noarch
-wrksrc="IPy-${version}"
-build_style=python-module
-pycompile_module="IPy.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 class for handling of IPv4 and IPv6 addresses and networks"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/autocracy/python-ipy"
-distfiles="${PYPI_SITE}/I/IPy/IPy-${version}.tar.gz"
-checksum=2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621
-
-post_install() {
-	vlicense COPYING
-}
-
-python3-IPy_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	archs=noarch
-	pycompile_module="IPy.py"
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING
-	}
-}
diff --git a/srcpkgs/python3-IPy b/srcpkgs/python3-IPy
deleted file mode 120000
index 1da828b7b17..00000000000
--- a/srcpkgs/python3-IPy
+++ /dev/null
@@ -1 +0,0 @@
-python-IPy
\ No newline at end of file
diff --git a/srcpkgs/python3-IPy/template b/srcpkgs/python3-IPy/template
new file mode 100644
index 00000000000..b5fc36135ad
--- /dev/null
+++ b/srcpkgs/python3-IPy/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-IPy'
+pkgname=python3-IPy
+version=1.00
+revision=3
+wrksrc="IPy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 class for handling of IPv4 and IPv6 addresses and networks"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/autocracy/python-ipy"
+distfiles="${PYPI_SITE}/I/IPy/IPy-${version}.tar.gz"
+checksum=2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621
+
+post_install() {
+	vlicense COPYING
+}

From c6d0afdcd8bca30159fb1e4a40e1e029f1d45103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:39:07 +0700
Subject: [PATCH 111/112] python-Django: drop package

---
 srcpkgs/python-Django/template | 22 ----------------------
 srcpkgs/python-Django/update   |  1 -
 2 files changed, 23 deletions(-)
 delete mode 100644 srcpkgs/python-Django/template
 delete mode 100644 srcpkgs/python-Django/update

diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template
deleted file mode 100644
index 6549f5c0fae..00000000000
--- a/srcpkgs/python-Django/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-Django'
-pkgname=python-Django
-version=1.11.29
-revision=1
-archs=noarch
-wrksrc="Django-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-pytz python-setuptools"
-short_desc="High-level Python2 Web framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.djangoproject.com/"
-distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
-checksum=4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c
-alternatives="django:django-admin:/usr/bin/django-admin2"
-
-post_install() {
-	vlicense LICENSE
-	rm -f ${DESTDIR}/usr/bin/django-admin.py*
-	mv ${DESTDIR}/usr/bin/django-admin{,2}
-}
diff --git a/srcpkgs/python-Django/update b/srcpkgs/python-Django/update
deleted file mode 100644
index ce4668c41ee..00000000000
--- a/srcpkgs/python-Django/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a* *b* *rc* [2-9]*"

From 88006ae10cfd25311073a4aa7f6e5dea161ca378 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 15 Sep 2020 16:58:55 +1000
Subject: [PATCH 112/112] fonttools: remove noarch.

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

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index f94f794b2a2..09f0db8bece 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,8 +1,7 @@
 # Template file for 'fonttools'
 pkgname=fonttools
 version=4.8.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] Python 2 drop (cont'd) #24995
  2020-09-21 11:43 [PR PATCH] Python 2 drop (cont'd) #24995 sgn
@ 2020-09-23 14:44 ` sgn
  2020-09-24 15:09 ` [PR PATCH] [Closed]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-09-23 14:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages python-2-drop-2
https://github.com/void-linux/void-packages/pull/25008

Python 2 drop (cont'd) #24995
Continue of #24995, split for Travis

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

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

From 5fcf39c09f4c278a7c33e49dd7378b18a603a053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:39:29 +0700
Subject: [PATCH 001/109] python-npyscreen: drop package

---
 srcpkgs/python-npyscreen/template  | 31 ------------------------------
 srcpkgs/python3-npyscreen          |  1 -
 srcpkgs/python3-npyscreen/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-npyscreen/template
 delete mode 120000 srcpkgs/python3-npyscreen
 create mode 100644 srcpkgs/python3-npyscreen/template

diff --git a/srcpkgs/python-npyscreen/template b/srcpkgs/python-npyscreen/template
deleted file mode 100644
index 2223850f22e..00000000000
--- a/srcpkgs/python-npyscreen/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-npyscreen'
-pkgname=python-npyscreen
-version=4.10.5.1
-revision=2
-wrksrc="npyscreen-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-pycompile_module="npyscreen"
-depends="python"
-short_desc="Python2 widget library and application framework for TUIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/bad-day/npyscreen"
-distfiles="https://github.com/bad-day/npyscreen/archive/${version}.tar.gz"
-checksum=6703c22d6bad3131b075d7d242c611a3c7ba8eae03f6d3cb414e3d35dae94b29
-archs=noarch
-
-post_install() {
-	vlicense LICENCE
-}
-
-python3-npyscreen_package() {
-	archs=noarch
-	pycompile_module="npyscreen"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENCE
-	}
-}
diff --git a/srcpkgs/python3-npyscreen b/srcpkgs/python3-npyscreen
deleted file mode 120000
index d55b0594563..00000000000
--- a/srcpkgs/python3-npyscreen
+++ /dev/null
@@ -1 +0,0 @@
-python-npyscreen
\ No newline at end of file
diff --git a/srcpkgs/python3-npyscreen/template b/srcpkgs/python3-npyscreen/template
new file mode 100644
index 00000000000..f9d29115bfe
--- /dev/null
+++ b/srcpkgs/python3-npyscreen/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-npyscreen'
+pkgname=python3-npyscreen
+version=4.10.5.1
+revision=3
+wrksrc="npyscreen-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 widget library and application framework for TUIs"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/bad-day/npyscreen"
+distfiles="https://github.com/bad-day/npyscreen/archive/${version}.tar.gz"
+checksum=6703c22d6bad3131b075d7d242c611a3c7ba8eae03f6d3cb414e3d35dae94b29
+
+post_install() {
+	vlicense LICENCE
+}

From 42240dba5884914daedc57e58b6f1e622a56caf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:40:40 +0700
Subject: [PATCH 002/109] python-nose2: drop package

---
 srcpkgs/python-nose2/template                 | 37 -------------------
 srcpkgs/python3-nose2                         |  1 -
 .../patches/no-versioned-nose2.patch          |  0
 srcpkgs/python3-nose2/template                | 19 ++++++++++
 4 files changed, 19 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-nose2/template
 delete mode 120000 srcpkgs/python3-nose2
 rename srcpkgs/{python-nose2 => python3-nose2}/patches/no-versioned-nose2.patch (100%)
 create mode 100644 srcpkgs/python3-nose2/template

diff --git a/srcpkgs/python-nose2/template b/srcpkgs/python-nose2/template
deleted file mode 100644
index 058abbd4253..00000000000
--- a/srcpkgs/python-nose2/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-nose2'
-pkgname=python-nose2
-version=0.8.0
-revision=2
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="nose2"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-coverage python-six python-mock"
-short_desc="The next generation of nicer testing (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/nose-devs/nose2"
-distfiles="${PYPI_SITE}/n/nose2/nose2-${version}.tar.gz"
-checksum=9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3
-alternatives="nose2:nose2:/usr/bin/python2-nose2"
-
-post_install() {
-	vlicense license.txt
-	# XXX override the default naming scheme
-	cp -a ${DESTDIR}/usr/bin/nose2 ${DESTDIR}/usr/bin/python3-nose2
-	mv ${DESTDIR}/usr/bin/nose2 ${DESTDIR}/usr/bin/python2-nose2
-}
-
-python3-nose2_package() {
-	archs=noarch
-	pycompile_module="nose2"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-setuptools python3-coverage python3-six"
-	alternatives="nose2:nose2:/usr/bin/python3-nose2"
-	pkg_install() {
-		vmove usr/bin/python3-nose2
-		vmove usr/lib/python3*
-		vlicense license.txt
-	}
-}
diff --git a/srcpkgs/python3-nose2 b/srcpkgs/python3-nose2
deleted file mode 120000
index 28ad1fd5002..00000000000
--- a/srcpkgs/python3-nose2
+++ /dev/null
@@ -1 +0,0 @@
-python-nose2
\ No newline at end of file
diff --git a/srcpkgs/python-nose2/patches/no-versioned-nose2.patch b/srcpkgs/python3-nose2/patches/no-versioned-nose2.patch
similarity index 100%
rename from srcpkgs/python-nose2/patches/no-versioned-nose2.patch
rename to srcpkgs/python3-nose2/patches/no-versioned-nose2.patch
diff --git a/srcpkgs/python3-nose2/template b/srcpkgs/python3-nose2/template
new file mode 100644
index 00000000000..a21c090356b
--- /dev/null
+++ b/srcpkgs/python3-nose2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-nose2'
+pkgname=python3-nose2
+version=0.8.0
+revision=3
+wrksrc="nose2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-coverage python3-six"
+short_desc="Next generation of nicer testing (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/nose-devs/nose2"
+distfiles="${PYPI_SITE}/n/nose2/nose2-${version}.tar.gz"
+checksum=9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3
+conflicts="python-nose2>=0"
+
+post_install() {
+	vlicense license.txt
+}

From aea8c58ff1ed583111d7cade8d6b60936e149b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:44:45 +0700
Subject: [PATCH 003/109] python-netaddr: drop package

---
 srcpkgs/python-netaddr/template  | 34 --------------------------------
 srcpkgs/python3-netaddr          |  1 -
 srcpkgs/python3-netaddr/template | 19 ++++++++++++++++++
 3 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-netaddr/template
 delete mode 120000 srcpkgs/python3-netaddr
 create mode 100644 srcpkgs/python3-netaddr/template

diff --git a/srcpkgs/python-netaddr/template b/srcpkgs/python-netaddr/template
deleted file mode 100644
index 20cc1c93134..00000000000
--- a/srcpkgs/python-netaddr/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-netaddr'
-pkgname=python-netaddr
-version=0.7.19
-revision=3
-archs=noarch
-wrksrc="netaddr-${version}"
-build_style=python-module
-pycompile_module="netaddr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 network address manipulation library"
-maintainer="Felix Hanley <felix@userspace.com.au>"
-homepage="https://github.com/drkjam/netaddr/"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/n/netaddr/netaddr-${version}.tar.gz"
-checksum=38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd
-alternatives="netaddr:netaddr:/usr/bin/netaddr2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-netaddr_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="netaddr"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="netaddr:netaddr:/usr/bin/netaddr3"
-	pkg_install() {
-		vmove usr/bin/netaddr3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-netaddr b/srcpkgs/python3-netaddr
deleted file mode 120000
index 4ab5a21db48..00000000000
--- a/srcpkgs/python3-netaddr
+++ /dev/null
@@ -1 +0,0 @@
-python-netaddr
\ No newline at end of file
diff --git a/srcpkgs/python3-netaddr/template b/srcpkgs/python3-netaddr/template
new file mode 100644
index 00000000000..4d6d5161b34
--- /dev/null
+++ b/srcpkgs/python3-netaddr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-netaddr'
+pkgname=python3-netaddr
+version=0.7.19
+revision=4
+wrksrc="netaddr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 network address manipulation library"
+maintainer="Felix Hanley <felix@userspace.com.au>"
+license="BSD-3-Clause"
+homepage="https://github.com/drkjam/netaddr/"
+distfiles="${PYPI_SITE}/n/netaddr/netaddr-${version}.tar.gz"
+checksum=38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd
+conflicts="python-netaddr>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 2c483992eb8316408d239ddbd2fb982bc5f89a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:50:05 +0700
Subject: [PATCH 004/109] python-namedlist: drop package

---
 srcpkgs/python-namedlist/template             | 26 -------------------
 srcpkgs/python3-namedlist                     |  1 -
 srcpkgs/python3-namedlist/template            | 14 ++++++++++
 .../update                                    |  0
 4 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-namedlist/template
 delete mode 120000 srcpkgs/python3-namedlist
 create mode 100644 srcpkgs/python3-namedlist/template
 rename srcpkgs/{python-namedlist => python3-namedlist}/update (100%)

diff --git a/srcpkgs/python-namedlist/template b/srcpkgs/python-namedlist/template
deleted file mode 100644
index f3698e39e10..00000000000
--- a/srcpkgs/python-namedlist/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-namedlist'
-pkgname=python-namedlist
-version=1.8
-revision=1
-archs=noarch
-wrksrc="namedlist-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="namedlist.py"
-short_desc="Similar to namedtuple, but instances are mutable"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="https://gitlab.com/ericvsmith/namedlist"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/n/namedlist/namedlist-${version}.tar.gz"
-checksum=34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef
-
-python3-namedlist_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="namedlist.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-namedlist b/srcpkgs/python3-namedlist
deleted file mode 120000
index df1c7622ef2..00000000000
--- a/srcpkgs/python3-namedlist
+++ /dev/null
@@ -1 +0,0 @@
-python-namedlist
\ No newline at end of file
diff --git a/srcpkgs/python3-namedlist/template b/srcpkgs/python3-namedlist/template
new file mode 100644
index 00000000000..1d947ec4cfd
--- /dev/null
+++ b/srcpkgs/python3-namedlist/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-namedlist'
+pkgname=python3-namedlist
+version=1.8
+revision=2
+wrksrc="namedlist-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Similar to namedtuple, but instances are mutable"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://gitlab.com/ericvsmith/namedlist"
+distfiles="${PYPI_SITE}/n/namedlist/namedlist-${version}.tar.gz"
+checksum=34f89fc992592c80b39a709e136edcf41ea17f24ba31eaf84a314a02c8b9bcef
diff --git a/srcpkgs/python-namedlist/update b/srcpkgs/python3-namedlist/update
similarity index 100%
rename from srcpkgs/python-namedlist/update
rename to srcpkgs/python3-namedlist/update

From 0bf9f3886ef8c943370f7aed7034ac15043a4fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:50:32 +0700
Subject: [PATCH 005/109] python-mygpoclient: drop package

---
 srcpkgs/python-mygpoclient/template  | 39 ----------------------------
 srcpkgs/python3-mygpoclient          |  1 -
 srcpkgs/python3-mygpoclient/template | 19 ++++++++++++++
 3 files changed, 19 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/python-mygpoclient/template
 delete mode 120000 srcpkgs/python3-mygpoclient
 create mode 100644 srcpkgs/python3-mygpoclient/template

diff --git a/srcpkgs/python-mygpoclient/template b/srcpkgs/python-mygpoclient/template
deleted file mode 100644
index ffad63a70a1..00000000000
--- a/srcpkgs/python-mygpoclient/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-mygpoclient'
-pkgname=python-mygpoclient
-version=1.8
-revision=3
-archs=noarch
-wrksrc="mygpoclient-${version}"
-build_style=python-module
-pycompile_module="mygpoclient"
-hostmakedepends="python-devel python3-devel"
-depends="python"
-short_desc="Client Library for gpodder.net (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/gpodder/mygpoclient"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=65fcb3ab220a2ba2d32a77f969b423a2f663413b6c485b7b02e5a955b28e68d2
-alternatives="
- mygpoclient:mygpo-bpsync:/usr/bin/mygpo-bpsync2
- mygpoclient:mygpo-list-devices:/usr/bin/mygpo-list-devices2
- mygpoclient:mygpo-simple-client:/usr/bin/mygpo-simple-client2"
-
-pre_build() {
-       sed -i '/share\/man\/man1/d' setup.py
-}
-
-python3-mygpoclient_package() {
-	alternatives="
-	 mygpoclient:mygpo-bpsync:/usr/bin/mygpo-bpsync3
-	 mygpoclient:mygpo-list-devices:/usr/bin/mygpo-list-devices3
-	 mygpoclient:mygpo-simple-client:/usr/bin/mygpo-simple-client3"
-	short_desc="${short_desc/Python2/Python3}"
-	pycompile_module="mygpoclient"
-	archs=noarch
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmove usr/bin/mygpo-*3
-	}
-}
diff --git a/srcpkgs/python3-mygpoclient b/srcpkgs/python3-mygpoclient
deleted file mode 120000
index b1c69e6b817..00000000000
--- a/srcpkgs/python3-mygpoclient
+++ /dev/null
@@ -1 +0,0 @@
-python-mygpoclient
\ No newline at end of file
diff --git a/srcpkgs/python3-mygpoclient/template b/srcpkgs/python3-mygpoclient/template
new file mode 100644
index 00000000000..4e7c97ea1b6
--- /dev/null
+++ b/srcpkgs/python3-mygpoclient/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mygpoclient'
+pkgname=python3-mygpoclient
+version=1.8
+revision=4
+wrksrc="mygpoclient-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel"
+depends="python3"
+short_desc="Client Library for gpodder.net (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gpodder/mygpoclient"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=65fcb3ab220a2ba2d32a77f969b423a2f663413b6c485b7b02e5a955b28e68d2
+conflicts="python-mygpoclient>=0"
+
+pre_build() {
+	sed -i '/share\/man\/man1/d' setup.py
+}

From 1358e6edbee383cff86f1bee322f460618aee5a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:50:52 +0700
Subject: [PATCH 006/109] python-mysqlclient: drop package

---
 srcpkgs/python-mysqlclient/template           | 23 -------------------
 srcpkgs/python3-mysqlclient                   |  1 -
 srcpkgs/python3-mysqlclient/template          | 14 +++++++++++
 .../update                                    |  0
 4 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/python-mysqlclient/template
 delete mode 120000 srcpkgs/python3-mysqlclient
 create mode 100644 srcpkgs/python3-mysqlclient/template
 rename srcpkgs/{python-mysqlclient => python3-mysqlclient}/update (100%)

diff --git a/srcpkgs/python-mysqlclient/template b/srcpkgs/python-mysqlclient/template
deleted file mode 100644
index 079666a6dab..00000000000
--- a/srcpkgs/python-mysqlclient/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-mysqlclient'
-pkgname=python-mysqlclient
-version=1.3.14
-revision=3
-wrksrc="mysqlclient-${version}"
-build_style=python-module
-pycompile_module="MySQLdb _mysql_exceptions.py"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="libmysqlclient-devel python-devel python3-devel zlib-devel libressl-devel"
-short_desc="Python2 interface to MySQL/MariaDB"
-maintainer="Alin Dobre <alin.dobre@outlook.com>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/PyMySQL/mysqlclient-python"
-distfiles="${PYPI_SITE}/m/mysqlclient/mysqlclient-${version}.tar.gz"
-checksum=3981ae9ce545901a36a8b7aed76ed02960a429f75dc53b7ad77fb2f9ab7cd56b
-
-python3-mysqlclient_package() {
-	pycompile_module="MySQLdb _mysql_exceptions.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-mysqlclient b/srcpkgs/python3-mysqlclient
deleted file mode 120000
index 75f09be07de..00000000000
--- a/srcpkgs/python3-mysqlclient
+++ /dev/null
@@ -1 +0,0 @@
-python-mysqlclient
\ No newline at end of file
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
new file mode 100644
index 00000000000..5685da31ab8
--- /dev/null
+++ b/srcpkgs/python3-mysqlclient/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-mysqlclient'
+pkgname=python3-mysqlclient
+version=1.3.14
+revision=3
+wrksrc="mysqlclient-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="libmysqlclient-devel python3-devel zlib-devel libressl-devel"
+short_desc="Python3 interface to MySQL/MariaDB"
+maintainer="Alin Dobre <alin.dobre@outlook.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/PyMySQL/mysqlclient-python"
+distfiles="${PYPI_SITE}/m/mysqlclient/mysqlclient-${version}.tar.gz"
+checksum=3981ae9ce545901a36a8b7aed76ed02960a429f75dc53b7ad77fb2f9ab7cd56b
diff --git a/srcpkgs/python-mysqlclient/update b/srcpkgs/python3-mysqlclient/update
similarity index 100%
rename from srcpkgs/python-mysqlclient/update
rename to srcpkgs/python3-mysqlclient/update

From 19f6b289c5b932e8cd13c08c88db3441aec113d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:52:20 +0700
Subject: [PATCH 007/109] python-munkres: drop package

---
 srcpkgs/python-munkres/template | 17 -----------------
 srcpkgs/python-munkres/update   |  2 --
 2 files changed, 19 deletions(-)
 delete mode 100644 srcpkgs/python-munkres/template
 delete mode 100644 srcpkgs/python-munkres/update

diff --git a/srcpkgs/python-munkres/template b/srcpkgs/python-munkres/template
deleted file mode 100644
index 97694aeac84..00000000000
--- a/srcpkgs/python-munkres/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-munkres'
-pkgname=python-munkres
-version=1.0.12
-revision=1
-archs=noarch
-wrksrc="munkres-release-${version}"
-build_style=python2-module
-pycompile_module="munkres.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Algorithm for the Assignment Problem (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/bmc/munkres"
-changelog="https://github.com/bmc/munkres/blob/master/CHANGELOG.md"
-distfiles="https://github.com/bmc/munkres/archive/release-${version}.tar.gz"
-checksum=70b3b32b4fed3b354e5c42e4d1273880a33a13ab8c108a4247140eb661767a0b
diff --git a/srcpkgs/python-munkres/update b/srcpkgs/python-munkres/update
deleted file mode 100644
index 336cd063743..00000000000
--- a/srcpkgs/python-munkres/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=release
-ignore=1.1.*

From 5b4d8c6a176b78656cd1ac9a791b0c814601bdc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:52:44 +0700
Subject: [PATCH 008/109] python-mtranslate: drop package

---
 srcpkgs/python-mtranslate/template  | 31 -----------------------------
 srcpkgs/python3-mtranslate          |  1 -
 srcpkgs/python3-mtranslate/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-mtranslate/template
 delete mode 120000 srcpkgs/python3-mtranslate
 create mode 100644 srcpkgs/python3-mtranslate/template

diff --git a/srcpkgs/python-mtranslate/template b/srcpkgs/python-mtranslate/template
deleted file mode 100644
index 992c7b76fe9..00000000000
--- a/srcpkgs/python-mtranslate/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-mtranslate'
-pkgname=python-mtranslate
-version=1.6
-revision=2
-archs=noarch
-wrksrc="mtranslate-${version}"
-build_style=python-module
-pycompile_module="mtranslate"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple api for google translate"
-maintainer="Benjamín Albiñana <benalb@gmail.com>"
-license="MIT"
-homepage="https://github.com/mouuff/mtranslate"
-distfiles="https://github.com/mouuff/mtranslate/archive/${version}.tar.gz"
-checksum=58fe274c692717a6e22acaf8712014a4ba1bd9a09409d246f31796f6f0117385
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-mtranslate_package() {
-	archs=noarch
-	pycompile_module="mtranslate"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-mtranslate b/srcpkgs/python3-mtranslate
deleted file mode 120000
index 6744c8f5a48..00000000000
--- a/srcpkgs/python3-mtranslate
+++ /dev/null
@@ -1 +0,0 @@
-python-mtranslate
\ No newline at end of file
diff --git a/srcpkgs/python3-mtranslate/template b/srcpkgs/python3-mtranslate/template
new file mode 100644
index 00000000000..e15e054b90e
--- /dev/null
+++ b/srcpkgs/python3-mtranslate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-mtranslate'
+pkgname=python3-mtranslate
+version=1.6
+revision=3
+wrksrc="mtranslate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple api for google translate"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="MIT"
+homepage="https://github.com/mouuff/mtranslate"
+distfiles="https://github.com/mouuff/mtranslate/archive/${version}.tar.gz"
+checksum=58fe274c692717a6e22acaf8712014a4ba1bd9a09409d246f31796f6f0117385
+
+post_install() {
+	vlicense LICENSE
+}

From 8e08103e9370573ad73dd27f39b71c0184383c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:54:08 +0700
Subject: [PATCH 009/109] python-mpd2: drop package

---
 srcpkgs/python-mpd2/template  | 30 ------------------------------
 srcpkgs/python3-mpd2          |  1 -
 srcpkgs/python3-mpd2/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-mpd2/template
 delete mode 120000 srcpkgs/python3-mpd2
 create mode 100644 srcpkgs/python3-mpd2/template

diff --git a/srcpkgs/python-mpd2/template b/srcpkgs/python-mpd2/template
deleted file mode 100644
index 0389f8c2a28..00000000000
--- a/srcpkgs/python-mpd2/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-mpd2'
-pkgname=python-mpd2
-version=1.0.0
-revision=2
-archs=noarch
-build_style=python-module
-pycompile_module="mpd"
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-Twisted python-mock"
-depends="python"
-short_desc="Python2 MPD client library"
-maintainer="Jens E. Becker <v2px@v2px.de>"
-homepage="https://github.com/Mic92/python-mpd2"
-license="LGPL-2.1-or-later"
-distfiles="https://github.com/Mic92/python-mpd2/archive/v${version}.tar.gz"
-checksum=877fa1685a56815107cb0b1eb004e7fe261b620fafd4d38cdaa2b6f3edd35928
-
-do_check() {
-	python2 -m unittest mpd.tests
-}
-
-python3-mpd2_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="mpd"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-mpd2 b/srcpkgs/python3-mpd2
deleted file mode 120000
index 27660282c4e..00000000000
--- a/srcpkgs/python3-mpd2
+++ /dev/null
@@ -1 +0,0 @@
-python-mpd2
\ No newline at end of file
diff --git a/srcpkgs/python3-mpd2/template b/srcpkgs/python3-mpd2/template
new file mode 100644
index 00000000000..794212831f7
--- /dev/null
+++ b/srcpkgs/python3-mpd2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mpd2'
+pkgname=python3-mpd2
+version=1.0.0
+revision=3
+wrksrc=python-mpd2-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-Twisted python3-mock"
+short_desc="Python3 MPD client library"
+maintainer="Jens E. Becker <v2px@v2px.de>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/Mic92/python-mpd2"
+distfiles="https://github.com/Mic92/python-mpd2/archive/v${version}.tar.gz"
+checksum=877fa1685a56815107cb0b1eb004e7fe261b620fafd4d38cdaa2b6f3edd35928
+
+do_check() {
+	python3 -m unittest mpd.tests
+}

From 7b9c7664687a38e23f463ebcd67b6b3fbcf9db14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 21:57:03 +0700
Subject: [PATCH 010/109] python-fasteners: drop package

---
 srcpkgs/python-fasteners/template             | 26 -------------------
 srcpkgs/python3-fasteners                     |  1 -
 .../patches/fasteners-monotonic.patch         |  0
 srcpkgs/python3-fasteners/template            | 14 ++++++++++
 4 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-fasteners/template
 delete mode 120000 srcpkgs/python3-fasteners
 rename srcpkgs/{python-fasteners => python3-fasteners}/patches/fasteners-monotonic.patch (100%)
 create mode 100644 srcpkgs/python3-fasteners/template

diff --git a/srcpkgs/python-fasteners/template b/srcpkgs/python-fasteners/template
deleted file mode 100644
index 24d2ec0611f..00000000000
--- a/srcpkgs/python-fasteners/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-fasteners'
-pkgname=python-fasteners
-version=0.15
-revision=2
-archs=noarch
-wrksrc="fasteners-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-monotonic python-six"
-pycompile_module="fasteners"
-short_desc="Python2 package that provides useful locks"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-homepage="https://pypi.org/project/fasteners/"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/f/fasteners/fasteners-${version}.tar.gz"
-checksum=3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef
-
-python3-fasteners_package() {
-	archs=noarch
-	depends="python3-six"
-	pycompile_module="fasteners"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-fasteners b/srcpkgs/python3-fasteners
deleted file mode 120000
index 0ca3f5f1810..00000000000
--- a/srcpkgs/python3-fasteners
+++ /dev/null
@@ -1 +0,0 @@
-python-fasteners
\ No newline at end of file
diff --git a/srcpkgs/python-fasteners/patches/fasteners-monotonic.patch b/srcpkgs/python3-fasteners/patches/fasteners-monotonic.patch
similarity index 100%
rename from srcpkgs/python-fasteners/patches/fasteners-monotonic.patch
rename to srcpkgs/python3-fasteners/patches/fasteners-monotonic.patch
diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template
new file mode 100644
index 00000000000..e5e5c7f206a
--- /dev/null
+++ b/srcpkgs/python3-fasteners/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-fasteners'
+pkgname=python3-fasteners
+version=0.15
+revision=3
+wrksrc="fasteners-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Python3 package that provides useful locks"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/fasteners/"
+distfiles="${PYPI_SITE}/f/fasteners/fasteners-${version}.tar.gz"
+checksum=3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef

From 0b44a9266f3b236448b9b27abaca0a1574467bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:02:23 +0700
Subject: [PATCH 011/109] python-mistune: drop package

---
 srcpkgs/python-mistune/template  | 31 -------------------------------
 srcpkgs/python3-mistune          |  1 -
 srcpkgs/python3-mistune/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-mistune/template
 delete mode 120000 srcpkgs/python3-mistune
 create mode 100644 srcpkgs/python3-mistune/template

diff --git a/srcpkgs/python-mistune/template b/srcpkgs/python-mistune/template
deleted file mode 100644
index ef5c054ba75..00000000000
--- a/srcpkgs/python-mistune/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-mistune'
-pkgname=python-mistune
-version=0.8.4
-revision=2
-archs=noarch
-wrksrc="mistune-${version}"
-build_style=python-module
-pycompile_module="mistune.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="The fastest markdown parser for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/lepture/mistune"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/m/mistune/mistune-${version}.tar.gz"
-checksum=59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-mistune_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="mistune.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-mistune b/srcpkgs/python3-mistune
deleted file mode 120000
index 26ea68379b8..00000000000
--- a/srcpkgs/python3-mistune
+++ /dev/null
@@ -1 +0,0 @@
-python-mistune
\ No newline at end of file
diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template
new file mode 100644
index 00000000000..9a7f9826e0a
--- /dev/null
+++ b/srcpkgs/python3-mistune/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-mistune'
+pkgname=python3-mistune
+version=0.8.4
+revision=3
+wrksrc="mistune-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Fast markdown parser for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/lepture/mistune"
+distfiles="${PYPI_SITE}/m/mistune/mistune-${version}.tar.gz"
+checksum=59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e
+
+post_install() {
+	vlicense LICENSE
+}

From 340d9319218b1f03a058f081b0cc3b70a22070ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:03:50 +0700
Subject: [PATCH 012/109] python-mccabe: drop package

---
 srcpkgs/python-mccabe/template  | 35 ---------------------------------
 srcpkgs/python3-mccabe          |  1 -
 srcpkgs/python3-mccabe/template | 22 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-mccabe/template
 delete mode 120000 srcpkgs/python3-mccabe
 create mode 100644 srcpkgs/python3-mccabe/template

diff --git a/srcpkgs/python-mccabe/template b/srcpkgs/python-mccabe/template
deleted file mode 100644
index 1e2ed6328b8..00000000000
--- a/srcpkgs/python-mccabe/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-mccabe'
-pkgname=python-mccabe
-version=0.6.1
-revision=3
-archs=noarch
-replaces="mccabe>=0"
-wrksrc="mccabe-${version}"
-build_style=python-module
-pycompile_module="mccabe.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="McCabe complexity checker for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/PyCQA/mccabe"
-license="MIT"
-distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
-checksum=dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f
-
-pre_build() {
-	sed -i '/setup_requires=/d' setup.py
-}
-post_install() {
-	vlicense LICENSE
-}
-
-python3-mccabe_package() {
-	archs=noarch
-	pycompile_module="mccabe.py"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-mccabe b/srcpkgs/python3-mccabe
deleted file mode 120000
index 78bc1fd5f05..00000000000
--- a/srcpkgs/python3-mccabe
+++ /dev/null
@@ -1 +0,0 @@
-python-mccabe
\ No newline at end of file
diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template
new file mode 100644
index 00000000000..58b382f72c4
--- /dev/null
+++ b/srcpkgs/python3-mccabe/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-mccabe'
+pkgname=python3-mccabe
+version=0.6.1
+revision=4
+wrksrc="mccabe-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="McCabe complexity checker for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/PyCQA/mccabe"
+distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
+checksum=dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f
+replaces="mccabe>=0"
+
+pre_build() {
+	vsed -i '/setup_requires=/d' setup.py
+}
+post_install() {
+	vlicense LICENSE
+}

From 222de202288e37f8aa67a3e5c782cd5980f3872b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:05:06 +0700
Subject: [PATCH 013/109] python-markdown2: drop package

---
 srcpkgs/python-markdown2/template  | 40 ------------------------------
 srcpkgs/python3-markdown2          |  1 -
 srcpkgs/python3-markdown2/template | 25 +++++++++++++++++++
 3 files changed, 25 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/python-markdown2/template
 delete mode 120000 srcpkgs/python3-markdown2
 create mode 100644 srcpkgs/python3-markdown2/template

diff --git a/srcpkgs/python-markdown2/template b/srcpkgs/python-markdown2/template
deleted file mode 100644
index e9068f64202..00000000000
--- a/srcpkgs/python-markdown2/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-markdown2'
-pkgname=python-markdown2
-version=2.3.8
-revision=2
-archs=noarch
-build_style=python-module
-pycompile_module="markdown2"
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Fast and complete implementation of Markdown in Python2"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://github.com/trentm/python-markdown2"
-distfiles="https://github.com/trentm/python-markdown2/archive/${version}.tar.gz"
-checksum=@f2439906b925fb3991b8e4c01909bd2e6cb3aa75ce64a053b5495f9c72726f77
-
-do_check() {
-	PY2PATH="${PWD}/build-2.7/lib"
-	PY3PATH="${PWD}/build-${py3_ver}/lib"
-
-	cd test
-	# On python2 markdown2/phpmarkdown/email_auto_links is broken;
-	# cf. https://github.com/trentm/python-markdown2/issues/5
-	#PYTHONPATH="${PY2PATH}" python2 test.py -- -knownfailure
-	PYTHONPATH="${PY3PATH}" python3 test.py -- -knownfailure
-}
-
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-markdown2_package() {
-	archs=noarch
-	pycompile_module="markdown2"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-markdown2 b/srcpkgs/python3-markdown2
deleted file mode 120000
index e6e6853527b..00000000000
--- a/srcpkgs/python3-markdown2
+++ /dev/null
@@ -1 +0,0 @@
-python-markdown2
\ No newline at end of file
diff --git a/srcpkgs/python3-markdown2/template b/srcpkgs/python3-markdown2/template
new file mode 100644
index 00000000000..b263ff0979f
--- /dev/null
+++ b/srcpkgs/python3-markdown2/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-markdown2'
+pkgname=python3-markdown2
+version=2.3.8
+revision=3
+wrksrc=python-markdown2-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Fast and complete implementation of Markdown in Python3"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://github.com/trentm/python-markdown2"
+distfiles="https://github.com/trentm/python-markdown2/archive/${version}.tar.gz"
+checksum=@f2439906b925fb3991b8e4c01909bd2e6cb3aa75ce64a053b5495f9c72726f77
+
+do_check() {
+	PY3PATH="${PWD}/build/lib"
+
+	cd test
+	PYTHONPATH="${PY3PATH}" python3 test.py -- -knownfailure
+}
+
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 781115651f311716c8d529c5aabb84e659361bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:05:44 +0700
Subject: [PATCH 014/109] python-magic: drop package

---
 srcpkgs/python-magic/template  | 30 ------------------------------
 srcpkgs/python3-magic          |  1 -
 srcpkgs/python3-magic/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-magic/template
 delete mode 120000 srcpkgs/python3-magic
 create mode 100644 srcpkgs/python3-magic/template

diff --git a/srcpkgs/python-magic/template b/srcpkgs/python-magic/template
deleted file mode 100644
index 6bb26bb6cd2..00000000000
--- a/srcpkgs/python-magic/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-magic'
-pkgname=python-magic
-version=0.4.18
-revision=2
-archs=noarch
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python libmagic"
-short_desc="File type identification using libmagic (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ahupp/python-magic"
-distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
-checksum=b787e8056c115f37e2af11e0b98dc67d5fc182ed5ed827a62f95e3a7f0ed4be4
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-magic_package() {
-	archs=noarch
-	depends="python3 libmagic"
-	# Beware: not an alternative
-	conflicts="python3-file-magic>=0"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-magic b/srcpkgs/python3-magic
deleted file mode 120000
index aee0e39c8c8..00000000000
--- a/srcpkgs/python3-magic
+++ /dev/null
@@ -1 +0,0 @@
-python-magic
\ No newline at end of file
diff --git a/srcpkgs/python3-magic/template b/srcpkgs/python3-magic/template
new file mode 100644
index 00000000000..3adb458996d
--- /dev/null
+++ b/srcpkgs/python3-magic/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-magic'
+pkgname=python3-magic
+version=0.4.18
+revision=3
+wrksrc=python-magic-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="libmagic"
+short_desc="File type identification using libmagic (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ahupp/python-magic"
+distfiles="https://github.com/ahupp/python-magic/archive/${version}.tar.gz"
+checksum=b787e8056c115f37e2af11e0b98dc67d5fc182ed5ed827a62f95e3a7f0ed4be4
+
+post_install() {
+	vlicense LICENSE
+}

From 29401e0bf601553e4a3094a4f16dc2adc459505f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:07:12 +0700
Subject: [PATCH 015/109] python-libtmux: drop package

---
 srcpkgs/python-libtmux/template  | 31 -------------------------------
 srcpkgs/python3-libtmux          |  1 -
 srcpkgs/python3-libtmux/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-libtmux/template
 delete mode 120000 srcpkgs/python3-libtmux
 create mode 100644 srcpkgs/python3-libtmux/template

diff --git a/srcpkgs/python-libtmux/template b/srcpkgs/python-libtmux/template
deleted file mode 100644
index 20f43af5f7d..00000000000
--- a/srcpkgs/python-libtmux/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-libtmux'
-pkgname=python-libtmux
-version=0.8.1
-revision=2
-archs=noarch
-wrksrc="libtmux-${version}"
-build_style=python-module
-pycompile_module="libtmux"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python binding for tmux"
-maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
-license="MIT"
-homepage="https://github.com/tmux-python/libtmux"
-distfiles="${PYPI_SITE}/l/libtmux/libtmux-${version}.tar.gz"
-checksum=5d4963cc4af53046cabd0997152af05a0a419e4c63af6737389b50f637c3852a
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-libtmux_package() {
-	archs=noarch
-	pycompile_module="libtmux"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-libtmux b/srcpkgs/python3-libtmux
deleted file mode 120000
index f02be05dcc2..00000000000
--- a/srcpkgs/python3-libtmux
+++ /dev/null
@@ -1 +0,0 @@
-python-libtmux
\ No newline at end of file
diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template
new file mode 100644
index 00000000000..cc704853b0e
--- /dev/null
+++ b/srcpkgs/python3-libtmux/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-libtmux'
+pkgname=python3-libtmux
+version=0.8.1
+revision=3
+wrksrc="libtmux-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python binding for tmux"
+maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
+license="MIT"
+homepage="https://github.com/tmux-python/libtmux"
+distfiles="${PYPI_SITE}/l/libtmux/libtmux-${version}.tar.gz"
+checksum=5d4963cc4af53046cabd0997152af05a0a419e4c63af6737389b50f637c3852a
+
+post_install() {
+	vlicense LICENSE
+}

From 2c905ded2ec656039511c2d621db9eca98983e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:07:40 +0700
Subject: [PATCH 016/109] python-kitchen: drop package

---
 srcpkgs/python-kitchen/template  | 26 --------------------------
 srcpkgs/python3-kitchen          |  1 -
 srcpkgs/python3-kitchen/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-kitchen/template
 delete mode 120000 srcpkgs/python3-kitchen
 create mode 100644 srcpkgs/python3-kitchen/template

diff --git a/srcpkgs/python-kitchen/template b/srcpkgs/python-kitchen/template
deleted file mode 100644
index 917131d6d93..00000000000
--- a/srcpkgs/python-kitchen/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-kitchen'
-pkgname=python-kitchen
-version=1.2.6
-revision=3
-archs=noarch
-wrksrc="kitchen-${version}"
-build_style=python-module
-pycompile_module="kitchen"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Useful snippets for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/fedora-infra/kitchen"
-distfiles="https://github.com/fedora-infra/kitchen/archive/${version}.tar.gz"
-checksum=6963dd84819713aafdd55e5314dcce6df5a37430b62fd9c48770e9f1a467b2b0
-
-python3-kitchen_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="kitchen"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-kitchen b/srcpkgs/python3-kitchen
deleted file mode 120000
index 39c60205412..00000000000
--- a/srcpkgs/python3-kitchen
+++ /dev/null
@@ -1 +0,0 @@
-python-kitchen
\ No newline at end of file
diff --git a/srcpkgs/python3-kitchen/template b/srcpkgs/python3-kitchen/template
new file mode 100644
index 00000000000..165899bfbab
--- /dev/null
+++ b/srcpkgs/python3-kitchen/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-kitchen'
+pkgname=python3-kitchen
+version=1.2.6
+revision=4
+wrksrc="kitchen-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Useful snippets for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fedora-infra/kitchen"
+distfiles="https://github.com/fedora-infra/kitchen/archive/${version}.tar.gz"
+checksum=6963dd84819713aafdd55e5314dcce6df5a37430b62fd9c48770e9f1a467b2b0

From 4cc9543ff798b9976b0be505bc5194e7be2f2530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:09:15 +0700
Subject: [PATCH 017/109] python-keepalive: drop package

---
 srcpkgs/python-keepalive/template  | 26 --------------------------
 srcpkgs/python3-keepalive          |  1 -
 srcpkgs/python3-keepalive/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-keepalive/template
 delete mode 120000 srcpkgs/python3-keepalive
 create mode 100644 srcpkgs/python3-keepalive/template

diff --git a/srcpkgs/python-keepalive/template b/srcpkgs/python-keepalive/template
deleted file mode 100644
index 50e1d7e6e78..00000000000
--- a/srcpkgs/python-keepalive/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-keepalive'
-pkgname=python-keepalive
-version=0.5
-revision=4
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="keepalive"
-short_desc="Python2 urllib keepalive support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/wikier/keepalive"
-license="LGPL-2.1"
-distfiles="${PYPI_SITE}/k/keepalive/keepalive-${version}.tar.gz"
-checksum=3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1
-
-python3-keepalive_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="keepalive"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-keepalive b/srcpkgs/python3-keepalive
deleted file mode 120000
index 1fd19ead4ac..00000000000
--- a/srcpkgs/python3-keepalive
+++ /dev/null
@@ -1 +0,0 @@
-python-keepalive
\ No newline at end of file
diff --git a/srcpkgs/python3-keepalive/template b/srcpkgs/python3-keepalive/template
new file mode 100644
index 00000000000..5272922253d
--- /dev/null
+++ b/srcpkgs/python3-keepalive/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-keepalive'
+pkgname=python3-keepalive
+version=0.5
+revision=5
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 urllib keepalive support"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/wikier/keepalive"
+distfiles="${PYPI_SITE}/k/keepalive/keepalive-${version}.tar.gz"
+checksum=3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1

From 1c06790c72220b946ea8f0b63412a796ab97b8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:09:51 +0700
Subject: [PATCH 018/109] python-kaptan: drop package

---
 srcpkgs/python-kaptan/template  | 34 ---------------------------------
 srcpkgs/python3-kaptan          |  1 -
 srcpkgs/python3-kaptan/template | 19 ++++++++++++++++++
 3 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-kaptan/template
 delete mode 120000 srcpkgs/python3-kaptan
 create mode 100644 srcpkgs/python3-kaptan/template

diff --git a/srcpkgs/python-kaptan/template b/srcpkgs/python-kaptan/template
deleted file mode 100644
index 6668b240008..00000000000
--- a/srcpkgs/python-kaptan/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-kaptan'
-pkgname=python-kaptan
-version=0.5.12
-revision=2
-archs=noarch
-wrksrc="kaptan-${version}"
-build_style=python-module
-pycompile_module="kaptan"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-yaml"
-short_desc="Configuration manager"
-maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
-license="BSD-3-Clause"
-homepage="https://github.com/emre/kaptan"
-distfiles="${PYPI_SITE}/k/kaptan/kaptan-${version}.tar.gz"
-checksum=@b0714c3c0c58006ca6d9fc5528d103685773ed22496d5dd582fbd7efe6a67c7a
-alternatives="kaptan:kaptan:/usr/bin/kaptan2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-kaptan_package() {
-	archs=noarch
-	pycompile_module="kaptan"
-	depends="python3 python3-yaml"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="kaptan:kaptan:/usr/bin/kaptan3"
-	pkg_install() {
-		vmove usr/bin/kaptan3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-kaptan b/srcpkgs/python3-kaptan
deleted file mode 120000
index b631fd50909..00000000000
--- a/srcpkgs/python3-kaptan
+++ /dev/null
@@ -1 +0,0 @@
-python-kaptan
\ No newline at end of file
diff --git a/srcpkgs/python3-kaptan/template b/srcpkgs/python3-kaptan/template
new file mode 100644
index 00000000000..c9af58bf95c
--- /dev/null
+++ b/srcpkgs/python3-kaptan/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-kaptan'
+pkgname=python3-kaptan
+version=0.5.12
+revision=3
+wrksrc="kaptan-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-yaml"
+short_desc="Configuration manager"
+maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
+license="BSD-3-Clause"
+homepage="https://github.com/emre/kaptan"
+distfiles="${PYPI_SITE}/k/kaptan/kaptan-${version}.tar.gz"
+checksum=@b0714c3c0c58006ca6d9fc5528d103685773ed22496d5dd582fbd7efe6a67c7a
+conflicts="python-kaptan>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 1eaff198f4bb7beba19acf585f50360ce778e90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:11:32 +0700
Subject: [PATCH 019/109] python-jsonschema: drop package

---
 srcpkgs/python-jsonschema/template  | 42 -----------------------------
 srcpkgs/python3-jsonschema          |  1 -
 srcpkgs/python3-jsonschema/template | 27 +++++++++++++++++++
 3 files changed, 27 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/python-jsonschema/template
 delete mode 120000 srcpkgs/python3-jsonschema
 create mode 100644 srcpkgs/python3-jsonschema/template

diff --git a/srcpkgs/python-jsonschema/template b/srcpkgs/python-jsonschema/template
deleted file mode 100644
index 326b5609d36..00000000000
--- a/srcpkgs/python-jsonschema/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-jsonschema'
-pkgname=python-jsonschema
-reverts="3.0.2_1"
-version=2.6.0
-revision=4
-archs=noarch
-wrksrc="jsonschema-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-functools32"
-pycompile_module="jsonschema"
-short_desc="Implementation of JSON Schema for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/Julian/jsonschema"
-license="MIT"
-distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
-checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
-alternatives="jsonschema:jsonschema:/usr/bin/jsonschema2"
-
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires/d' \
-		-e '/vcversioner/d' \
-		-e "/name=/a\
-		version=\"${version}\","
-}
-post_install() {
-	vlicense COPYING LICENSE
-}
-
-python3-jsonschema_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	pycompile_module="jsonschema"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jsonschema:jsonschema:/usr/bin/jsonschema3"
-	pkg_install() {
-		vmove usr/bin/jsonschema3
-		vmove usr/lib/python3*
-		vlicense COPYING LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jsonschema b/srcpkgs/python3-jsonschema
deleted file mode 120000
index 7eeab716dba..00000000000
--- a/srcpkgs/python3-jsonschema
+++ /dev/null
@@ -1 +0,0 @@
-python-jsonschema
\ No newline at end of file
diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template
new file mode 100644
index 00000000000..48686ae9a73
--- /dev/null
+++ b/srcpkgs/python3-jsonschema/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-jsonschema'
+pkgname=python3-jsonschema
+reverts="3.0.2_1"
+version=2.6.0
+revision=5
+wrksrc="jsonschema-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Implementation of JSON Schema for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/Julian/jsonschema"
+distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz"
+checksum=6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02
+conflicts="python-jsonschema>=0"
+
+pre_build() {
+	vsed -i setup.py \
+		-e '/setup_requires/d' \
+		-e '/vcversioner/d' \
+		-e "/name=/a\
+		version=\"${version}\","
+}
+post_install() {
+	vlicense COPYING LICENSE
+}

From 3f8e61dd7e9013f166247518acd8a647203c1bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:13:55 +0700
Subject: [PATCH 020/109] python-jsonrpclib: drop package

---
 srcpkgs/python-jsonrpclib/template  | 26 --------------------------
 srcpkgs/python3-jsonrpclib          |  1 -
 srcpkgs/python3-jsonrpclib/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-jsonrpclib/template
 delete mode 120000 srcpkgs/python3-jsonrpclib
 create mode 100644 srcpkgs/python3-jsonrpclib/template

diff --git a/srcpkgs/python-jsonrpclib/template b/srcpkgs/python-jsonrpclib/template
deleted file mode 100644
index a245168a824..00000000000
--- a/srcpkgs/python-jsonrpclib/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-jsonrpclib'
-pkgname=python-jsonrpclib
-version=0.4.0
-revision=2
-archs=noarch
-wrksrc="jsonrpclib-pelix-${version}"
-build_style=python-module
-pycompile_module="jsonrpclib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the JSON-RPC v2.0 specification"
-maintainer="Charles E. Lehner <cel@celehner.com>"
-license="Apache-2.0"
-homepage="https://github.com/tcalmant/jsonrpclib"
-distfiles="${PYPI_SITE}/j/jsonrpclib-pelix/jsonrpclib-pelix-${version}.tar.gz"
-checksum=19c558e169a51480b39548783067ca55046b62b2409ab4559931255e12f635de
-
-python3-jsonrpclib_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
-
diff --git a/srcpkgs/python3-jsonrpclib b/srcpkgs/python3-jsonrpclib
deleted file mode 120000
index 20b7851a50e..00000000000
--- a/srcpkgs/python3-jsonrpclib
+++ /dev/null
@@ -1 +0,0 @@
-python-jsonrpclib
\ No newline at end of file
diff --git a/srcpkgs/python3-jsonrpclib/template b/srcpkgs/python3-jsonrpclib/template
new file mode 100644
index 00000000000..3cf4a83073c
--- /dev/null
+++ b/srcpkgs/python3-jsonrpclib/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-jsonrpclib'
+pkgname=python3-jsonrpclib
+version=0.4.0
+revision=3
+wrksrc="jsonrpclib-pelix-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the JSON-RPC v2.0 specification"
+maintainer="Charles E. Lehner <cel@celehner.com>"
+license="Apache-2.0"
+homepage="https://github.com/tcalmant/jsonrpclib"
+distfiles="${PYPI_SITE}/j/jsonrpclib-pelix/jsonrpclib-pelix-${version}.tar.gz"
+checksum=19c558e169a51480b39548783067ca55046b62b2409ab4559931255e12f635de

From 4f2c95420ed577fe910bba0886112efd020a8fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:15:44 +0700
Subject: [PATCH 021/109] python-jsonpointer: drop package

---
 srcpkgs/python-jsonpointer/template  | 34 ----------------------------
 srcpkgs/python3-jsonpointer          |  1 -
 srcpkgs/python3-jsonpointer/template | 19 ++++++++++++++++
 3 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-jsonpointer/template
 delete mode 120000 srcpkgs/python3-jsonpointer
 create mode 100644 srcpkgs/python3-jsonpointer/template

diff --git a/srcpkgs/python-jsonpointer/template b/srcpkgs/python-jsonpointer/template
deleted file mode 100644
index fd103d123aa..00000000000
--- a/srcpkgs/python-jsonpointer/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-jsonpointer'
-pkgname=python-jsonpointer
-version=2.0
-revision=2
-archs=noarch
-wrksrc="jsonpointer-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="jsonpointer.py"
-short_desc="Resolve JSON Pointers according to RFC 6901 (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/stefankoegl/python-json-pointer"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz"
-checksum=c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362
-alternatives="jsonpointer:jsonpointer:/usr/bin/jsonpointer2"
-
-post_install() {
-	vlicense LICENSE.txt LICENSE
-}
-
-python3-jsonpointer_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="jsonpointer.py"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jsonpointer:jsonpointer:/usr/bin/jsonpointer3"
-	pkg_install() {
-		vmove usr/bin/jsonpointer3
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-jsonpointer b/srcpkgs/python3-jsonpointer
deleted file mode 120000
index af23236e7d6..00000000000
--- a/srcpkgs/python3-jsonpointer
+++ /dev/null
@@ -1 +0,0 @@
-python-jsonpointer
\ No newline at end of file
diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template
new file mode 100644
index 00000000000..f8d27a50d6d
--- /dev/null
+++ b/srcpkgs/python3-jsonpointer/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-jsonpointer'
+pkgname=python3-jsonpointer
+version=2.0
+revision=3
+wrksrc="jsonpointer-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Resolve JSON Pointers according to RFC 6901 (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/stefankoegl/python-json-pointer"
+distfiles="${PYPI_SITE}/j/jsonpointer/jsonpointer-${version}.tar.gz"
+checksum=c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362
+conflicts="python-jsonpointer>=0"
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From b9dfc3ae1ede3f909e0cdec4f9cf91a2e4b26ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:16:27 +0700
Subject: [PATCH 022/109] python-botocore: drop package

---
 srcpkgs/python-botocore/template  | 24 ------------------------
 srcpkgs/python3-botocore          |  1 -
 srcpkgs/python3-botocore/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/python-botocore/template
 delete mode 120000 srcpkgs/python3-botocore
 create mode 100644 srcpkgs/python3-botocore/template

diff --git a/srcpkgs/python-botocore/template b/srcpkgs/python-botocore/template
deleted file mode 100644
index 600559839d2..00000000000
--- a/srcpkgs/python-botocore/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-botocore'
-pkgname=python-botocore
-version=1.17.28
-revision=1
-archs=noarch
-wrksrc="botocore-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-dateutil python-docutils python-jmespath python-urllib3"
-short_desc="Core functionality library of boto 3 (Python2)"
-maintainer="Robert Lowry <bobertlo@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/boto/botocore"
-distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=c9a4b4ffedeff89848a899bd4634be46a21a190690b505c2050888c0a5447936
-
-python3-botocore_package() {
-	archs=noarch
-	depends="python3-dateutil python3-docutils python3-jmespath python3-urllib3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-botocore b/srcpkgs/python3-botocore
deleted file mode 120000
index e4216cb4265..00000000000
--- a/srcpkgs/python3-botocore
+++ /dev/null
@@ -1 +0,0 @@
-python-botocore
\ No newline at end of file
diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
new file mode 100644
index 00000000000..d4ac8e92f37
--- /dev/null
+++ b/srcpkgs/python3-botocore/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-botocore'
+pkgname=python3-botocore
+version=1.17.28
+revision=2
+wrksrc="botocore-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-dateutil python3-docutils python3-jmespath python3-urllib3"
+short_desc="Core functionality library of boto 3 (Python3)"
+maintainer="Robert Lowry <bobertlo@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/boto/botocore"
+distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
+checksum=c9a4b4ffedeff89848a899bd4634be46a21a190690b505c2050888c0a5447936

From a0441d56ea1658ff8c8e76c49a39c4bedbc5251c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:16:41 +0700
Subject: [PATCH 023/109] python-jmespath: drop package

---
 srcpkgs/python-jmespath/template  | 32 -------------------------------
 srcpkgs/python3-jmespath          |  1 -
 srcpkgs/python3-jmespath/template | 19 ++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-jmespath/template
 delete mode 120000 srcpkgs/python3-jmespath
 create mode 100644 srcpkgs/python3-jmespath/template

diff --git a/srcpkgs/python-jmespath/template b/srcpkgs/python-jmespath/template
deleted file mode 100644
index 6f1dfcecf0f..00000000000
--- a/srcpkgs/python-jmespath/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-jmespath'
-pkgname=python-jmespath
-version=0.10.0
-revision=1
-archs=noarch
-wrksrc="jmespath.py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="JSON Query language for Python2"
-maintainer="yopito <pierre.bourgin@free.fr>"
-license="MIT"
-homepage="http://jmespath.org"
-distfiles="https://github.com/jmespath/jmespath.py/archive/${version}.tar.gz"
-checksum=999b0ef13b798cf04de5451a51201d63a6feaf07c3fdcfbab4e5bca2b4ac653e
-alternatives="jmespath:jp.py:/usr/bin/jp.py2"
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-jmespath_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="jmespath:jp.py:/usr/bin/jp.py3"
-	pkg_install() {
-		vlicense LICENSE.txt
-		vmove usr/lib/python3*
-		vmove usr/bin/*3
-	}
-}
diff --git a/srcpkgs/python3-jmespath b/srcpkgs/python3-jmespath
deleted file mode 120000
index a0dad3f3662..00000000000
--- a/srcpkgs/python3-jmespath
+++ /dev/null
@@ -1 +0,0 @@
-python-jmespath
\ No newline at end of file
diff --git a/srcpkgs/python3-jmespath/template b/srcpkgs/python3-jmespath/template
new file mode 100644
index 00000000000..0bcd20e6b28
--- /dev/null
+++ b/srcpkgs/python3-jmespath/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-jmespath'
+pkgname=python3-jmespath
+version=0.10.0
+revision=2
+wrksrc="jmespath.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="JSON Query language for Python3"
+maintainer="yopito <pierre.bourgin@free.fr>"
+license="MIT"
+homepage="http://jmespath.org"
+distfiles="https://github.com/jmespath/jmespath.py/archive/${version}.tar.gz"
+checksum=999b0ef13b798cf04de5451a51201d63a6feaf07c3fdcfbab4e5bca2b4ac653e
+conflicts="python-jmespath>=0"
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 72233642c139139e24193a22a208a6219fe9f2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:17:27 +0700
Subject: [PATCH 024/109] python-Cheroot: drop package

---
 srcpkgs/python-Cheroot/template  | 43 --------------------------------
 srcpkgs/python3-Cheroot          |  1 -
 srcpkgs/python3-Cheroot/template | 29 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/python-Cheroot/template
 delete mode 120000 srcpkgs/python3-Cheroot
 create mode 100644 srcpkgs/python3-Cheroot/template

diff --git a/srcpkgs/python-Cheroot/template b/srcpkgs/python-Cheroot/template
deleted file mode 100644
index ce0447f4d35..00000000000
--- a/srcpkgs/python-Cheroot/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-Cheroot'
-pkgname=python-Cheroot
-version=8.3.1
-revision=1
-archs=noarch
-wrksrc="cheroot-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-six python-more-itertools
- python-backports.functools_lru_cache python-jaraco.functools"
-short_desc="High-performance, pure-Python HTTP server (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/cherrypy/cheroot"
-changelog="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz"
-checksum=7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8
-alternatives="cheroot:cheroot:/usr/bin/cheroot2"
-
-pre_build() {
-	vsed -i setup.cfg \
-		-e '/setuptools_scm/d' \
-		-e '/use_scm_version/d' \
-		-e "/name = /a\
-		version = ${version}"
-}
-
-post_install() {
-	vlicense LICENSE.md
-}
-
-python3-Cheroot_package() {
-	archs=noarch
-	depends="python3-setuptools python3-six python3-more-itertools
-	 python3-jaraco.functools"
-	alternatives="cheroot:cheroot:/usr/bin/cheroot3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense LICENSE.md
-	}
-}
diff --git a/srcpkgs/python3-Cheroot b/srcpkgs/python3-Cheroot
deleted file mode 120000
index 46f9f7c6fdc..00000000000
--- a/srcpkgs/python3-Cheroot
+++ /dev/null
@@ -1 +0,0 @@
-python-Cheroot
\ No newline at end of file
diff --git a/srcpkgs/python3-Cheroot/template b/srcpkgs/python3-Cheroot/template
new file mode 100644
index 00000000000..a1f74ef3846
--- /dev/null
+++ b/srcpkgs/python3-Cheroot/template
@@ -0,0 +1,29 @@
+# Template file for 'python3-Cheroot'
+pkgname=python3-Cheroot
+version=8.3.1
+revision=2
+wrksrc="cheroot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-six python3-more-itertools
+ python3-jaraco.functools"
+short_desc="High-performance, pure-Python HTTP server (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/cherrypy/cheroot"
+changelog="https://github.com/cherrypy/cheroot/blob/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/c/cheroot/cheroot-${version}.tar.gz"
+checksum=7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8
+conflicts="python-Cheroot>=0"
+
+pre_build() {
+	vsed -i setup.cfg \
+		-e '/setuptools_scm/d' \
+		-e '/use_scm_version/d' \
+		-e "/name = /a\
+		version = ${version}"
+}
+
+post_install() {
+	vlicense LICENSE.md
+}

From a7ff089d9a2a55730e2d1d3e40f0b84f33504c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:17:53 +0700
Subject: [PATCH 025/109] python-jaraco.functools: drop package

---
 srcpkgs/python-jaraco.functools/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-jaraco.functools/template

diff --git a/srcpkgs/python-jaraco.functools/template b/srcpkgs/python-jaraco.functools/template
deleted file mode 100644
index 55c82a8101a..00000000000
--- a/srcpkgs/python-jaraco.functools/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-jaraco.functools'
-pkgname=python-jaraco.functools
-version=2.0
-revision=3
-archs=noarch
-wrksrc="jaraco.functools-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-more-itertools python-backports.functools_lru_cache"
-short_desc="Functools like those found in stdlib (Python2)"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://github.com/jaraco/jaraco.functools"
-changelog="https://raw.githubusercontent.com/jaraco/jaraco.functools/${version}/CHANGES.rst"
-distfiles="${PYPI_SITE}/j/jaraco.functools/jaraco.functools-${version}.tar.gz"
-checksum=35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345
-
-post_install() {
-	vlicense LICENSE
-}

From 36afc17edf0dad7378e15bc52f16b8c5d19c3600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:18:46 +0700
Subject: [PATCH 026/109] python-isort: drop package

---
 srcpkgs/python-isort/template  | 42 ----------------------------------
 srcpkgs/python3-isort          |  1 -
 srcpkgs/python3-isort/template | 25 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/python-isort/template
 delete mode 120000 srcpkgs/python3-isort
 create mode 100644 srcpkgs/python3-isort/template

diff --git a/srcpkgs/python-isort/template b/srcpkgs/python-isort/template
deleted file mode 100644
index cd8e43b69ea..00000000000
--- a/srcpkgs/python-isort/template
+++ /dev/null
@@ -1,42 +0,0 @@
-# Template file for 'python-isort'
-pkgname=python-isort
-version=4.3.21
-revision=2
-archs=noarch
-wrksrc="isort-${version}"
-build_style=python-module
-pycompile_module="isort"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-futures"
-checkdepends="python-pytest python3-pytest
- python-backports.functools_lru_cache"
-short_desc="Python2 utility/library to sort imports"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/timothycrosley/isort"
-changelog="https://raw.githubusercontent.com/timothycrosley/isort/master/CHANGELOG.md"
-distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
-checksum=54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1
-alternatives="isort:isort:/usr/bin/isort2"
-
-do_check() {
-	pytest test_isort.py
-	pytest3 test_isort.py
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-isort_package() {
-	archs=noarch
-	pycompile_module="isort"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="isort:isort:/usr/bin/isort3"
-	pkg_install() {
-		vmove usr/bin/isort3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-isort b/srcpkgs/python3-isort
deleted file mode 120000
index 7b803ff7bfe..00000000000
--- a/srcpkgs/python3-isort
+++ /dev/null
@@ -1 +0,0 @@
-python-isort
\ No newline at end of file
diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template
new file mode 100644
index 00000000000..801bef84afb
--- /dev/null
+++ b/srcpkgs/python3-isort/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-isort'
+pkgname=python3-isort
+version=4.3.21
+revision=3
+wrksrc="isort-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Python3 utility/library to sort imports"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/timothycrosley/isort"
+changelog="https://raw.githubusercontent.com/timothycrosley/isort/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/i/isort/isort-${version}.tar.gz"
+checksum=54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1
+conflicts="python-isort>=0"
+
+do_check() {
+	pytest3 test_isort.py
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 0b4b23e114e0101feb69714ed0730c4471cf4324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:20:48 +0700
Subject: [PATCH 027/109] python-isbnlib: drop package

---
 srcpkgs/python-isbnlib/template  | 31 -------------------------------
 srcpkgs/python3-isbnlib          |  1 -
 srcpkgs/python3-isbnlib/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-isbnlib/template
 delete mode 120000 srcpkgs/python3-isbnlib
 create mode 100644 srcpkgs/python3-isbnlib/template

diff --git a/srcpkgs/python-isbnlib/template b/srcpkgs/python-isbnlib/template
deleted file mode 100644
index 1cc46a060d6..00000000000
--- a/srcpkgs/python-isbnlib/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-isbnlib'
-pkgname=python-isbnlib
-version=3.9.6
-revision=2
-archs=noarch
-wrksrc="isbnlib-${version}"
-build_style=python-module
-pycompile_module="isbnlib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for ISBN"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="LGPL-3.0-only"
-homepage="https://github.com/xlcnd/isbnlib"
-distfiles="${PYPI_SITE}/i/isbnlib/isbnlib-${version}.tar.gz"
-checksum=d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-isbnlib_package() {
-	archs=noarch
-	pycompile_module="isbnlib"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-isbnlib b/srcpkgs/python3-isbnlib
deleted file mode 120000
index cc5370bdda0..00000000000
--- a/srcpkgs/python3-isbnlib
+++ /dev/null
@@ -1 +0,0 @@
-python-isbnlib
\ No newline at end of file
diff --git a/srcpkgs/python3-isbnlib/template b/srcpkgs/python3-isbnlib/template
new file mode 100644
index 00000000000..3ca66ed74d7
--- /dev/null
+++ b/srcpkgs/python3-isbnlib/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-isbnlib'
+pkgname=python3-isbnlib
+version=3.9.6
+revision=3
+wrksrc="isbnlib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for ISBN"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="LGPL-3.0-only"
+homepage="https://github.com/xlcnd/isbnlib"
+distfiles="${PYPI_SITE}/i/isbnlib/isbnlib-${version}.tar.gz"
+checksum=d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b

From 9e2fe747798dd87322c7eed78e8e84878d1f82e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:22:09 +0700
Subject: [PATCH 028/109] python-iptools: drop package

---
 srcpkgs/python-iptools/template  | 31 -------------------------------
 srcpkgs/python3-iptools          |  1 -
 srcpkgs/python3-iptools/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-iptools/template
 delete mode 120000 srcpkgs/python3-iptools
 create mode 100644 srcpkgs/python3-iptools/template

diff --git a/srcpkgs/python-iptools/template b/srcpkgs/python-iptools/template
deleted file mode 100644
index 3c53013fb9d..00000000000
--- a/srcpkgs/python-iptools/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-iptools'
-pkgname=python-iptools
-version=0.7.0
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="iptools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 utilites for manipulating IPv4 and IPv6 addresses"
-maintainer="Andrew Mirghassemi <a.mirghassemi@live.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/bd808/python-iptools"
-distfiles="${PYPI_SITE}/i/iptools/iptools-${version}.tar.gz"
-checksum=118a4f638bb5fa0123df56fe3be703b112a689167539bcc194f8698ccdd9e2ea
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-iptools_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="iptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-iptools b/srcpkgs/python3-iptools
deleted file mode 120000
index df602e9b469..00000000000
--- a/srcpkgs/python3-iptools
+++ /dev/null
@@ -1 +0,0 @@
-python-iptools
\ No newline at end of file
diff --git a/srcpkgs/python3-iptools/template b/srcpkgs/python3-iptools/template
new file mode 100644
index 00000000000..9f1107dddb0
--- /dev/null
+++ b/srcpkgs/python3-iptools/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-iptools'
+pkgname=python3-iptools
+version=0.7.0
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 utilites for manipulating IPv4 and IPv6 addresses"
+maintainer="Andrew Mirghassemi <a.mirghassemi@live.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/bd808/python-iptools"
+distfiles="${PYPI_SITE}/i/iptools/iptools-${version}.tar.gz"
+checksum=118a4f638bb5fa0123df56fe3be703b112a689167539bcc194f8698ccdd9e2ea
+
+post_install() {
+	vlicense LICENSE
+}

From af60d4e33492ce0e7168a42fafbb0f3931aed2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:22:58 +0700
Subject: [PATCH 029/109] python-ipaddr: drop package

---
 srcpkgs/python-ipaddr/template | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 srcpkgs/python-ipaddr/template

diff --git a/srcpkgs/python-ipaddr/template b/srcpkgs/python-ipaddr/template
deleted file mode 100644
index 9bd50773ae6..00000000000
--- a/srcpkgs/python-ipaddr/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-ipaddr'
-pkgname=python-ipaddr
-version=2.2.0
-revision=1
-archs=noarch
-wrksrc="ipaddr-${version}"
-build_style=python2-module
-pycompile_module="ipaddr.py"
-hostmakedepends="python"
-makedepends="python-devel"
-short_desc="Python IP address manipulation library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/google/ipaddr-py"
-distfiles="${PYPI_SITE}/i/ipaddr/ipaddr-${version}.tar.gz"
-checksum=4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6

From 39f6979393c2a413e0b5b2928574bc133e16a940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:23:30 +0700
Subject: [PATCH 030/109] python-inotify: drop package

---
 srcpkgs/python-inotify/template  | 31 -------------------------------
 srcpkgs/python3-inotify          |  1 -
 srcpkgs/python3-inotify/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-inotify/template
 delete mode 120000 srcpkgs/python3-inotify
 create mode 100644 srcpkgs/python3-inotify/template

diff --git a/srcpkgs/python-inotify/template b/srcpkgs/python-inotify/template
deleted file mode 100644
index 64e48fd9330..00000000000
--- a/srcpkgs/python-inotify/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-inotify'
-pkgname=python-inotify
-version=0.9.6
-revision=4
-archs=noarch
-wrksrc="pyinotify-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="pyinotify.py"
-short_desc="Monitoring filesystems events with inotify on Linux (Python2)"
-homepage="https://github.com/seb-m/pyinotify/"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-distfiles="${PYPI_SITE}/p/pyinotify/pyinotify-${version}.tar.gz"
-checksum=9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4
-
-post_install() {
-	vlicense COPYING
-}
-
-python3-inotify_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="pyinotify.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING
-	}
-}
diff --git a/srcpkgs/python3-inotify b/srcpkgs/python3-inotify
deleted file mode 120000
index cddf3ff670b..00000000000
--- a/srcpkgs/python3-inotify
+++ /dev/null
@@ -1 +0,0 @@
-python-inotify
\ No newline at end of file
diff --git a/srcpkgs/python3-inotify/template b/srcpkgs/python3-inotify/template
new file mode 100644
index 00000000000..f714203427d
--- /dev/null
+++ b/srcpkgs/python3-inotify/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-inotify'
+pkgname=python3-inotify
+version=0.9.6
+revision=5
+wrksrc="pyinotify-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Monitoring filesystems events with inotify on Linux (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/seb-m/pyinotify/"
+distfiles="${PYPI_SITE}/p/pyinotify/pyinotify-${version}.tar.gz"
+checksum=9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4
+
+post_install() {
+	vlicense COPYING
+}

From 12322c6f7a014ff1f6dad7da2cdf118e278987a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:24:09 +0700
Subject: [PATCH 031/109] python-imagesize: drop package

---
 srcpkgs/python-imagesize/template  | 31 ------------------------------
 srcpkgs/python3-imagesize          |  1 -
 srcpkgs/python3-imagesize/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-imagesize/template
 delete mode 120000 srcpkgs/python3-imagesize
 create mode 100644 srcpkgs/python3-imagesize/template

diff --git a/srcpkgs/python-imagesize/template b/srcpkgs/python-imagesize/template
deleted file mode 100644
index f64c86812b5..00000000000
--- a/srcpkgs/python-imagesize/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-imagesize'
-pkgname=python-imagesize
-version=1.1.0
-revision=2
-archs=noarch
-wrksrc="imagesize-${version}"
-build_style=python-module
-pycompile_module="imagesize.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library to get image size from png/jpeg/jpeg2000/gif file"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/shibukawa/imagesize_py"
-license="MIT"
-distfiles="${PYPI_SITE}/i/imagesize/imagesize-${version}.tar.gz"
-checksum=f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5
-
-post_install() {
-	vlicense LICENSE.rst
-}
-
-python3-imagesize_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="imagesize.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-imagesize b/srcpkgs/python3-imagesize
deleted file mode 120000
index ee3a0552dab..00000000000
--- a/srcpkgs/python3-imagesize
+++ /dev/null
@@ -1 +0,0 @@
-python-imagesize
\ No newline at end of file
diff --git a/srcpkgs/python3-imagesize/template b/srcpkgs/python3-imagesize/template
new file mode 100644
index 00000000000..90a8db9fa29
--- /dev/null
+++ b/srcpkgs/python3-imagesize/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-imagesize'
+pkgname=python3-imagesize
+version=1.1.0
+revision=3
+wrksrc="imagesize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library to get image size from png/jpeg/jpeg2000/gif file"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/shibukawa/imagesize_py"
+distfiles="${PYPI_SITE}/i/imagesize/imagesize-${version}.tar.gz"
+checksum=f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5
+
+post_install() {
+	vlicense LICENSE.rst
+}

From 70746b088da61a75aaa33bd3cee91597e64415f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:24:42 +0700
Subject: [PATCH 032/109] python-icalendar: drop package

---
 srcpkgs/python-icalendar/template  | 33 ------------------------------
 srcpkgs/python3-icalendar          |  1 -
 srcpkgs/python3-icalendar/template | 20 ++++++++++++++++++
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-icalendar/template
 delete mode 120000 srcpkgs/python3-icalendar
 create mode 100644 srcpkgs/python3-icalendar/template

diff --git a/srcpkgs/python-icalendar/template b/srcpkgs/python-icalendar/template
deleted file mode 100644
index dbb7ddb8fd3..00000000000
--- a/srcpkgs/python-icalendar/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-icalendar'
-pkgname=python-icalendar
-version=4.0.6
-revision=1
-archs=noarch
-wrksrc="icalendar-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-dateutil python-pytz"
-checkdepends="python3-dateutil python3-pytz python3-pytest python3-hypothesis"
-short_desc="Parser/generator of iCalendar files for use with Python2"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-2-Clause"
-homepage="https://github.com/collective/icalendar"
-distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz"
-checksum=7e6fe7232622abe32d8f54d0936ffcd5a9087198a4c2f1ec1803a7dd9fdd979f
-alternatives="icalendar:icalendar:/usr/bin/icalendar2"
-
-post_install() {
-	vlicense LICENSE.rst LICENSE
-}
-
-python3-icalendar_package() {
-	archs=noarch
-	depends="python3-setuptools python3-dateutil python3-pytz"
-	alternatives="icalendar:icalendar:/usr/bin/icalendar3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst LICENSE
-	}
-}
diff --git a/srcpkgs/python3-icalendar b/srcpkgs/python3-icalendar
deleted file mode 120000
index ac651ba0a62..00000000000
--- a/srcpkgs/python3-icalendar
+++ /dev/null
@@ -1 +0,0 @@
-python-icalendar
\ No newline at end of file
diff --git a/srcpkgs/python3-icalendar/template b/srcpkgs/python3-icalendar/template
new file mode 100644
index 00000000000..8d3514449bf
--- /dev/null
+++ b/srcpkgs/python3-icalendar/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-icalendar'
+pkgname=python3-icalendar
+version=4.0.6
+revision=2
+wrksrc="icalendar-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-dateutil python3-pytz"
+checkdepends="python3-dateutil python3-pytz python3-pytest python3-hypothesis"
+short_desc="Parser/generator of iCalendar files for use with Python3"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-2-Clause"
+homepage="https://github.com/collective/icalendar"
+distfiles="${PYPI_SITE}/i/icalendar/icalendar-${version}.tar.gz"
+checksum=7e6fe7232622abe32d8f54d0936ffcd5a9087198a4c2f1ec1803a7dd9fdd979f
+conflicts="python-icalendar>=0"
+
+post_install() {
+	vlicense LICENSE.rst LICENSE
+}

From 8ec4e0b1caeda84beeac97b8e28dbe7a739443bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:25:24 +0700
Subject: [PATCH 033/109] python-Flask-Babel: drop package

---
 srcpkgs/python-Flask-Babel/template  | 29 ----------------------------
 srcpkgs/python3-Flask-Babel          |  1 -
 srcpkgs/python3-Flask-Babel/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-Babel/template
 delete mode 120000 srcpkgs/python3-Flask-Babel
 create mode 100644 srcpkgs/python3-Flask-Babel/template

diff --git a/srcpkgs/python-Flask-Babel/template b/srcpkgs/python-Flask-Babel/template
deleted file mode 100644
index e5b600bf922..00000000000
--- a/srcpkgs/python-Flask-Babel/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-Flask-Babel'
-pkgname=python-Flask-Babel
-version=1.0.0
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-Babel python-Jinja2 python-Flask"
-short_desc="Python2 i18n and l10n support for Flask based on Babel and pytz"
-maintainer="pulux <pulux@pf4sh.de>"
-license="BSD-3-Clause"
-homepage="https://pythonhosted.org/Flask-Babel/"
-distfiles="${PYPI_SITE}/F/Flask-Babel/Flask-Babel-${version}.tar.gz"
-checksum=d6a70468f9a8919d59fba2a291a003da3a05ff884275dddbd965f3b98b09ab3e
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-Babel_package() {
-	archs=noarch
-	depends="python3-setuptools python3-Jinja2 python3-Babel python3-Flask"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-Babel b/srcpkgs/python3-Flask-Babel
deleted file mode 120000
index 591168740eb..00000000000
--- a/srcpkgs/python3-Flask-Babel
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-Babel
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-Babel/template b/srcpkgs/python3-Flask-Babel/template
new file mode 100644
index 00000000000..f838af3c735
--- /dev/null
+++ b/srcpkgs/python3-Flask-Babel/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Babel'
+pkgname=python3-Flask-Babel
+version=1.0.0
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-Jinja2 python3-Babel python3-Flask"
+short_desc="Python3 i18n and l10n support for Flask based on Babel and pytz"
+maintainer="pulux <pulux@pf4sh.de>"
+license="BSD-3-Clause"
+homepage="https://pythonhosted.org/Flask-Babel/"
+distfiles="${PYPI_SITE}/F/Flask-Babel/Flask-Babel-${version}.tar.gz"
+checksum=d6a70468f9a8919d59fba2a291a003da3a05ff884275dddbd965f3b98b09ab3e
+
+post_install() {
+	vlicense LICENSE
+}

From cf15835924307f34bc83121fb4a252ad4113e8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:25:40 +0700
Subject: [PATCH 034/109] python-Flask-Login: drop package

---
 srcpkgs/python-Flask-Login/template  | 29 ----------------------------
 srcpkgs/python3-Flask-Login          |  1 -
 srcpkgs/python3-Flask-Login/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-Login/template
 delete mode 120000 srcpkgs/python3-Flask-Login
 create mode 100644 srcpkgs/python3-Flask-Login/template

diff --git a/srcpkgs/python-Flask-Login/template b/srcpkgs/python-Flask-Login/template
deleted file mode 100644
index a9b982bdce6..00000000000
--- a/srcpkgs/python-Flask-Login/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-Flask-Login'
-pkgname=python-Flask-Login
-version=0.5.0
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Flask"
-short_desc="User session management for Flask (Python2)"
-maintainer="pulux <pulux@pf4sh.de>"
-license="MIT"
-homepage="https://github.com/maxcountryman/flask-login"
-distfiles="${PYPI_SITE}/F/Flask-Login/Flask-Login-${version}.tar.gz"
-checksum=6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-Login_package() {
-	archs=noarch
-	depends="python3-Flask"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-Login b/srcpkgs/python3-Flask-Login
deleted file mode 120000
index aacc1d0c164..00000000000
--- a/srcpkgs/python3-Flask-Login
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-Login
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-Login/template b/srcpkgs/python3-Flask-Login/template
new file mode 100644
index 00000000000..ee5d3fc6a61
--- /dev/null
+++ b/srcpkgs/python3-Flask-Login/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Login'
+pkgname=python3-Flask-Login
+version=0.5.0
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Flask"
+short_desc="User session management for Flask (Python3)"
+maintainer="pulux <pulux@pf4sh.de>"
+license="MIT"
+homepage="https://github.com/maxcountryman/flask-login"
+distfiles="${PYPI_SITE}/F/Flask-Login/Flask-Login-${version}.tar.gz"
+checksum=6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b
+
+post_install() {
+	vlicense LICENSE
+}

From 96ef31e04824fa743499dc2e61b94537a1ffcc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:26:31 +0700
Subject: [PATCH 035/109] python-Flask-Script: drop package

---
 srcpkgs/python-Flask-Script/template  | 31 ---------------------------
 srcpkgs/python3-Flask-Script          |  1 -
 srcpkgs/python3-Flask-Script/template | 18 ++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-Script/template
 delete mode 120000 srcpkgs/python3-Flask-Script
 create mode 100644 srcpkgs/python3-Flask-Script/template

diff --git a/srcpkgs/python-Flask-Script/template b/srcpkgs/python-Flask-Script/template
deleted file mode 100644
index ebac828a5b1..00000000000
--- a/srcpkgs/python-Flask-Script/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-Flask-Script'
-pkgname=python-Flask-Script
-version=2.0.6
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="flask_script"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Flask"
-short_desc="Scripting support for Flask (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
-homepage="https://github.com/smurfix/flask-script"
-distfiles="${PYPI_SITE}/F/Flask-Script/Flask-Script-${version}.tar.gz"
-checksum=6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-Script_package() {
-	archs=noarch
-	depends="python3-Flask"
-	pycompile_module="flask_script"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-Script b/srcpkgs/python3-Flask-Script
deleted file mode 120000
index 9fe2b37813b..00000000000
--- a/srcpkgs/python3-Flask-Script
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-Script
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-Script/template b/srcpkgs/python3-Flask-Script/template
new file mode 100644
index 00000000000..692d682da6a
--- /dev/null
+++ b/srcpkgs/python3-Flask-Script/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Script'
+pkgname=python3-Flask-Script
+version=2.0.6
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Flask"
+short_desc="Scripting support for Flask (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/smurfix/flask-script"
+distfiles="${PYPI_SITE}/F/Flask-Script/Flask-Script-${version}.tar.gz"
+checksum=6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65
+
+post_install() {
+	vlicense LICENSE
+}

From db58643f463a5173351e9929a75f892f4752e5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:26:52 +0700
Subject: [PATCH 036/109] python-Flask-WTF: drop package

---
 srcpkgs/python-Flask-WTF/template  | 29 -----------------------------
 srcpkgs/python3-Flask-WTF          |  1 -
 srcpkgs/python3-Flask-WTF/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-Flask-WTF/template
 delete mode 120000 srcpkgs/python3-Flask-WTF
 create mode 100644 srcpkgs/python3-Flask-WTF/template

diff --git a/srcpkgs/python-Flask-WTF/template b/srcpkgs/python-Flask-WTF/template
deleted file mode 100644
index f72307f79be..00000000000
--- a/srcpkgs/python-Flask-WTF/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-Flask-WTF'
-pkgname=python-Flask-WTF
-version=0.14.3
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-Flask python-WTForms"
-short_desc="Simple integration of Flask and WTForms (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/lepture/flask-wtf"
-distfiles="${PYPI_SITE}/F/Flask-WTF/Flask-WTF-${version}.tar.gz"
-checksum=d417e3a0008b5ba583da1763e4db0f55a1269d9dd91dcc3eb3c026d3c5dbd720
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Flask-WTF_package() {
-	archs=noarch
-	depends="python3-Flask python3-WTForms"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Flask-WTF b/srcpkgs/python3-Flask-WTF
deleted file mode 120000
index d9346f045fd..00000000000
--- a/srcpkgs/python3-Flask-WTF
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask-WTF
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask-WTF/template b/srcpkgs/python3-Flask-WTF/template
new file mode 100644
index 00000000000..4ab989ca651
--- /dev/null
+++ b/srcpkgs/python3-Flask-WTF/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-WTF'
+pkgname=python3-Flask-WTF
+version=0.14.3
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Flask python3-WTForms"
+short_desc="Simple integration of Flask and WTForms (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/lepture/flask-wtf"
+distfiles="${PYPI_SITE}/F/Flask-WTF/Flask-WTF-${version}.tar.gz"
+checksum=d417e3a0008b5ba583da1763e4db0f55a1269d9dd91dcc3eb3c026d3c5dbd720
+
+post_install() {
+	vlicense LICENSE
+}

From 9857719b08de37dcbfb0c213139193f4569a45b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:27:29 +0700
Subject: [PATCH 037/109] python-Flask: drop package

---
 srcpkgs/python-Flask/template  | 34 ----------------------------------
 srcpkgs/python3-Flask          |  1 -
 srcpkgs/python3-Flask/template | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-Flask/template
 delete mode 120000 srcpkgs/python3-Flask
 create mode 100644 srcpkgs/python3-Flask/template

diff --git a/srcpkgs/python-Flask/template b/srcpkgs/python-Flask/template
deleted file mode 100644
index 1aa7f5208ed..00000000000
--- a/srcpkgs/python-Flask/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-Flask'
-pkgname=python-Flask
-version=1.1.2
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-Jinja2 python-Werkzeug python-itsdangerous python-click"
-checkdepends="${depends} python-pytest python-hypothesis
- python3-pytest python3-hypothesis"
-short_desc="Python2 web microframework"
-maintainer="Markus Berger <pulux@pf4sh.de>"
-license="BSD-3-Clause"
-homepage="http://flask.pocoo.org"
-distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz"
-checksum=4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060
-alternatives="flask:flask:/usr/bin/flask2"
-
-post_install() {
-	vlicense LICENSE.rst
-}
-
-python3-Flask_package() {
-	archs=noarch
-	depends="python3-setuptools python3-Jinja2 python3-Werkzeug python3-itsdangerous python3-click"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="flask:flask:/usr/bin/flask3"
-	pkg_install() {
-		vmove usr/bin/flask3
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-Flask b/srcpkgs/python3-Flask
deleted file mode 120000
index 491c9a5f443..00000000000
--- a/srcpkgs/python3-Flask
+++ /dev/null
@@ -1 +0,0 @@
-python-Flask
\ No newline at end of file
diff --git a/srcpkgs/python3-Flask/template b/srcpkgs/python3-Flask/template
new file mode 100644
index 00000000000..b90a920b546
--- /dev/null
+++ b/srcpkgs/python3-Flask/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-Flask'
+pkgname=python3-Flask
+version=1.1.2
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-Jinja2 python3-Werkzeug
+ python3-itsdangerous python3-click"
+checkdepends="${depends}
+python3-pytest python3-hypothesis"
+short_desc="Python3 web microframework"
+maintainer="Markus Berger <pulux@pf4sh.de>"
+license="BSD-3-Clause"
+homepage="http://flask.pocoo.org"
+distfiles="${PYPI_SITE}/F/Flask/Flask-${version}.tar.gz"
+checksum=4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060
+conflicts="python-Flask>=0"
+
+post_install() {
+	vlicense LICENSE.rst
+}

From c04b6f3a98868d4d8ad80985aba3a1b9d9451792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:27:51 +0700
Subject: [PATCH 038/109] python-Werkzeug: drop package

---
 srcpkgs/python-Werkzeug/template  | 31 -------------------------------
 srcpkgs/python3-Werkzeug          |  1 -
 srcpkgs/python3-Werkzeug/template | 20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-Werkzeug/template
 delete mode 120000 srcpkgs/python3-Werkzeug
 create mode 100644 srcpkgs/python3-Werkzeug/template

diff --git a/srcpkgs/python-Werkzeug/template b/srcpkgs/python-Werkzeug/template
deleted file mode 100644
index b4bf1071851..00000000000
--- a/srcpkgs/python-Werkzeug/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-Werkzeug'
-pkgname=python-Werkzeug
-version=1.0.1
-revision=1
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python-pytest python-hypothesis python-requests
- python3-pytest python3-hypothesis python3-requests"
-short_desc="Swiss Army knife of Python web development (Python2)"
-maintainer="Markus Berger <pulux@pf4sh.de>"
-license="BSD-3-Clause"
-homepage="https://palletsprojects.com/p/werkzeug/"
-distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
-checksum=6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c
-
-post_install() {
-	vlicense LICENSE.rst
-}
-
-python3-Werkzeug_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst
-	}
-}
diff --git a/srcpkgs/python3-Werkzeug b/srcpkgs/python3-Werkzeug
deleted file mode 120000
index 3a0fb848426..00000000000
--- a/srcpkgs/python3-Werkzeug
+++ /dev/null
@@ -1 +0,0 @@
-python-Werkzeug
\ No newline at end of file
diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
new file mode 100644
index 00000000000..d0722e9d93b
--- /dev/null
+++ b/srcpkgs/python3-Werkzeug/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-Werkzeug'
+pkgname=python3-Werkzeug
+version=1.0.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="
+python3-pytest python3-hypothesis python3-requests"
+short_desc="Swiss Army knife of Python web development (Python3)"
+maintainer="Markus Berger <pulux@pf4sh.de>"
+license="BSD-3-Clause"
+homepage="https://palletsprojects.com/p/werkzeug/"
+distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
+checksum=6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c
+
+post_install() {
+	vlicense LICENSE.rst
+}

From dfed30d04637407794a3c4153f540181f373cfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:28:42 +0700
Subject: [PATCH 039/109] python-hyper-h2: drop package

---
 srcpkgs/python-hyper-h2/template  | 28 ----------------------------
 srcpkgs/python3-hyper-h2          |  1 -
 srcpkgs/python3-hyper-h2/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/python-hyper-h2/template
 delete mode 120000 srcpkgs/python3-hyper-h2
 create mode 100644 srcpkgs/python3-hyper-h2/template

diff --git a/srcpkgs/python-hyper-h2/template b/srcpkgs/python-hyper-h2/template
deleted file mode 100644
index eb29959d45b..00000000000
--- a/srcpkgs/python-hyper-h2/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-hyper-h2'
-pkgname=python-hyper-h2
-version=3.2.0
-revision=1
-archs=noarch
-wrksrc="hyper-h2-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-hpack python-hyperframe"
-short_desc="HTTP/2 State-Machine based protocol implementation(Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyper-h2"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ef4213b73e113905c67fdc0abd677c6e2dff53894e657fbc12987ae5c00b6c91
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-hyper-h2_package() {
-	archs=noarch
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3 python3-hpack python3-hyperframe"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-hyper-h2 b/srcpkgs/python3-hyper-h2
deleted file mode 120000
index 3e2cb726599..00000000000
--- a/srcpkgs/python3-hyper-h2
+++ /dev/null
@@ -1 +0,0 @@
-python-hyper-h2
\ No newline at end of file
diff --git a/srcpkgs/python3-hyper-h2/template b/srcpkgs/python3-hyper-h2/template
new file mode 100644
index 00000000000..bf56f8bc69d
--- /dev/null
+++ b/srcpkgs/python3-hyper-h2/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hyper-h2'
+pkgname=python3-hyper-h2
+version=3.2.0
+revision=2
+wrksrc="hyper-h2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-hpack python3-hyperframe"
+short_desc="HTTP/2 State-Machine based protocol implementation(Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/python-hyper/hyper-h2"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ef4213b73e113905c67fdc0abd677c6e2dff53894e657fbc12987ae5c00b6c91
+
+post_install() {
+	vlicense LICENSE
+}

From 0c9bc629fff0b641b44c83500472df77f5bc28af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:29:07 +0700
Subject: [PATCH 040/109] python-hyperframe: drop package

---
 srcpkgs/python-hyperframe/template  | 30 -----------------------------
 srcpkgs/python3-hyperframe          |  1 -
 srcpkgs/python3-hyperframe/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-hyperframe/template
 delete mode 120000 srcpkgs/python3-hyperframe
 create mode 100644 srcpkgs/python3-hyperframe/template

diff --git a/srcpkgs/python-hyperframe/template b/srcpkgs/python-hyperframe/template
deleted file mode 100644
index 6b544c2061c..00000000000
--- a/srcpkgs/python-hyperframe/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-hyperframe'
-pkgname=python-hyperframe
-version=5.2.0
-revision=2
-archs=noarch
-wrksrc=hyperframe-${version}
-build_style=python-module
-pycompile_module="hyperframe"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python HTTP/2 framing (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://python-hyper.org/hyperframe/"
-distfiles="https://github.com/python-hyper/hyperframe/archive/v${version}.tar.gz"
-checksum=cd69754e1a7dc16ac5b9c128ffcbb54b7598853bd54ed24a94df29a58eb541ec
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-hyperframe_package() {
-	archs=noarch
-	pycompile_module="hyperframe"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-hyperframe b/srcpkgs/python3-hyperframe
deleted file mode 120000
index 6a9d1016f10..00000000000
--- a/srcpkgs/python3-hyperframe
+++ /dev/null
@@ -1 +0,0 @@
-python-hyperframe
\ No newline at end of file
diff --git a/srcpkgs/python3-hyperframe/template b/srcpkgs/python3-hyperframe/template
new file mode 100644
index 00000000000..edae28f1acb
--- /dev/null
+++ b/srcpkgs/python3-hyperframe/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hyperframe'
+pkgname=python3-hyperframe
+version=5.2.0
+revision=3
+wrksrc=hyperframe-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python HTTP/2 framing (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://python-hyper.org/hyperframe/"
+distfiles="https://github.com/python-hyper/hyperframe/archive/v${version}.tar.gz"
+checksum=cd69754e1a7dc16ac5b9c128ffcbb54b7598853bd54ed24a94df29a58eb541ec
+
+post_install() {
+	vlicense LICENSE
+}

From 0961430fb402d28259dcfdb6d2b072cac3942079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:29:54 +0700
Subject: [PATCH 041/109] python-httplib2: drop package

---
 srcpkgs/python3-httplib2                      |  1 -
 .../template                                  | 27 ++++++-------------
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/python3-httplib2
 rename srcpkgs/{python-httplib2 => python3-httplib2}/template (60%)

diff --git a/srcpkgs/python3-httplib2 b/srcpkgs/python3-httplib2
deleted file mode 120000
index a9367265aad..00000000000
--- a/srcpkgs/python3-httplib2
+++ /dev/null
@@ -1 +0,0 @@
-python-httplib2
\ No newline at end of file
diff --git a/srcpkgs/python-httplib2/template b/srcpkgs/python3-httplib2/template
similarity index 60%
rename from srcpkgs/python-httplib2/template
rename to srcpkgs/python3-httplib2/template
index 3a31c396621..de7bdb42255 100644
--- a/srcpkgs/python-httplib2/template
+++ b/srcpkgs/python3-httplib2/template
@@ -1,15 +1,14 @@
-# Template file for 'python-httplib2'
-pkgname=python-httplib2
+# Template file for 'python3-httplib2'
+pkgname=python3-httplib2
 version=0.14.0
-revision=3
-archs=noarch
+revision=4
 create_wrksrc=yes
 build_wrksrc="httplib2-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python ca-certificates"
-short_desc="Comprehensive HTTP client library (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 ca-certificates"
+short_desc="Comprehensive HTTP client library (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/httplib2/httplib2"
 changelog="https://raw.githubusercontent.com/httplib2/httplib2/master/CHANGELOG"
@@ -27,13 +26,3 @@ post_install() {
 
 	vlicense ../LICENSE.txt
 }
-
-python3-httplib2_package() {
-	archs=noarch
-	depends="python3 ca-certificates"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense ../LICENSE.txt
-	}
-}

From 1dd2f69a1017cff651ff94d95550db2d2b2fd997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:31:11 +0700
Subject: [PATCH 042/109] python-gitlab: drop package

---
 srcpkgs/python-gitlab/template  | 34 ---------------------------------
 srcpkgs/python3-gitlab          |  1 -
 srcpkgs/python3-gitlab/template | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-gitlab/template
 delete mode 120000 srcpkgs/python3-gitlab
 create mode 100644 srcpkgs/python3-gitlab/template

diff --git a/srcpkgs/python-gitlab/template b/srcpkgs/python-gitlab/template
deleted file mode 100644
index 0f71b4c7153..00000000000
--- a/srcpkgs/python-gitlab/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-gitlab'
-pkgname=python-gitlab
-version=1.12.1
-revision=2
-archs=noarch
-build_style=python-module
-pycompile_module="gitlab"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-requests python-six"
-checkdepends="${depends} python-httmock python-mock"
-short_desc="Wrapper for GitLab's API (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/gpocentek/python-gitlab"
-changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
-distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
-checksum=984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec
-alternatives="python-gitlab:gitlab:/usr/bin/gitlab2"
-
-do_check() {
-	python2 setup.py test
-}
-
-python3-gitlab_package() {
-	archs=noarch
-	depends="python3-setuptools python3-requests python3-six"
-	pycompile_module="gitlab"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="python-gitlab:gitlab:/usr/bin/gitlab3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-gitlab b/srcpkgs/python3-gitlab
deleted file mode 120000
index 67de9d9568d..00000000000
--- a/srcpkgs/python3-gitlab
+++ /dev/null
@@ -1 +0,0 @@
-python-gitlab
\ No newline at end of file
diff --git a/srcpkgs/python3-gitlab/template b/srcpkgs/python3-gitlab/template
new file mode 100644
index 00000000000..79ab51d7ae9
--- /dev/null
+++ b/srcpkgs/python3-gitlab/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-gitlab'
+pkgname=python3-gitlab
+version=1.12.1
+revision=3
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-requests python3-six"
+checkdepends="${depends}"
+short_desc="Wrapper for GitLab's API (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/gpocentek/python-gitlab"
+changelog="https://raw.githubusercontent.com/python-gitlab/python-gitlab/master/ChangeLog.rst"
+distfiles="${PYPI_SITE}/p/python-gitlab/python-gitlab-${version}.tar.gz"
+checksum=984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec
+conflicts="python-gitlab>=0"
+
+do_check() {
+	python2 setup.py test
+}

From 05ac0acf123df596ca3a0b93097ba5e95c048141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:31:23 +0700
Subject: [PATCH 043/109] python-httmock: drop package

---
 srcpkgs/python-httmock/template  | 31 -------------------------------
 srcpkgs/python3-httmock          |  1 -
 srcpkgs/python3-httmock/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-httmock/template
 delete mode 120000 srcpkgs/python3-httmock
 create mode 100644 srcpkgs/python3-httmock/template

diff --git a/srcpkgs/python-httmock/template b/srcpkgs/python-httmock/template
deleted file mode 100644
index e798b4fc1b3..00000000000
--- a/srcpkgs/python-httmock/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-httmock'
-pkgname=python-httmock
-version=1.3.0
-revision=2
-archs=noarch
-wrksrc="httmock-${version}"
-build_style=python-module
-pycompile_module="httmock.py"
-hostmakedepends="python3-setuptools python-setuptools"
-depends="python-requests"
-checkdepends="python3-requests"
-short_desc="Mocking library for requests (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/patrys/httmock"
-distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
-checksum=4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
-
-do_check() {
-	python3 setup.py test
-}
-
-python3-httmock_package() {
-	archs=noarch
-	pycompile_module="httmock.py"
-	depends="python3-requests"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-httmock b/srcpkgs/python3-httmock
deleted file mode 120000
index cb20ded1289..00000000000
--- a/srcpkgs/python3-httmock
+++ /dev/null
@@ -1 +0,0 @@
-python-httmock
\ No newline at end of file
diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template
new file mode 100644
index 00000000000..7c8195dd3f8
--- /dev/null
+++ b/srcpkgs/python3-httmock/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-httmock'
+pkgname=python3-httmock
+version=1.3.0
+revision=3
+wrksrc="httmock-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests"
+checkdepends="python3-requests"
+short_desc="Mocking library for requests (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/patrys/httmock"
+distfiles="https://github.com/patrys/httmock/archive/${version}.tar.gz"
+checksum=4716729f0d07f3f6043dde43545a5381c4c6031a62e9dc9eed21e73c63d86722
+
+do_check() {
+	python3 setup.py test
+}

From 8c5d810ba46fe760c401c9277ea7f761e76e2896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:31:55 +0700
Subject: [PATCH 044/109] python-hpack: drop package

---
 srcpkgs/python-hpack/template  | 30 ------------------------------
 srcpkgs/python3-hpack          |  1 -
 srcpkgs/python3-hpack/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-hpack/template
 delete mode 120000 srcpkgs/python3-hpack
 create mode 100644 srcpkgs/python3-hpack/template

diff --git a/srcpkgs/python-hpack/template b/srcpkgs/python-hpack/template
deleted file mode 100644
index ffbac313103..00000000000
--- a/srcpkgs/python-hpack/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-hpack'
-pkgname=python-hpack
-version=3.0.0
-revision=2
-archs=noarch
-wrksrc=hpack-${version}
-build_style=python-module
-pycompile_module="hpack"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="HTTP/2 Header Encoding (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://python-hyper.org/hpack/"
-distfiles="https://github.com/python-hyper/hpack/archive/v${version}.tar.gz"
-checksum=0f8f5f92cfa59f91804eabb237d4b18895f3e200e282c41cedf6cd11a4416daa
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-hpack_package() {
-	archs=noarch
-	pycompile_module="hpack"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-hpack b/srcpkgs/python3-hpack
deleted file mode 120000
index 4d4e7a11154..00000000000
--- a/srcpkgs/python3-hpack
+++ /dev/null
@@ -1 +0,0 @@
-python-hpack
\ No newline at end of file
diff --git a/srcpkgs/python3-hpack/template b/srcpkgs/python3-hpack/template
new file mode 100644
index 00000000000..7eb9889b862
--- /dev/null
+++ b/srcpkgs/python3-hpack/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-hpack'
+pkgname=python3-hpack
+version=3.0.0
+revision=3
+wrksrc=hpack-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="HTTP/2 Header Encoding (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://python-hyper.org/hpack/"
+distfiles="https://github.com/python-hyper/hpack/archive/v${version}.tar.gz"
+checksum=0f8f5f92cfa59f91804eabb237d4b18895f3e200e282c41cedf6cd11a4416daa
+
+post_install() {
+	vlicense LICENSE
+}

From e64a924bef4faacebf9998d3d22a5299e702086f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:32:22 +0700
Subject: [PATCH 045/109] python-habanero: drop package

---
 srcpkgs/python-habanero/template  | 31 -------------------------------
 srcpkgs/python3-habanero          |  1 -
 srcpkgs/python3-habanero/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-habanero/template
 delete mode 120000 srcpkgs/python3-habanero
 create mode 100644 srcpkgs/python3-habanero/template

diff --git a/srcpkgs/python-habanero/template b/srcpkgs/python-habanero/template
deleted file mode 100644
index a914f21ecb7..00000000000
--- a/srcpkgs/python-habanero/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-habanero'
-pkgname=python-habanero
-version=0.6.2
-revision=2
-archs=noarch
-wrksrc="habanero-${version}"
-build_style=python-module
-pycompile_module="habanero"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-requests"
-short_desc="Python2 low level client for Crossref Search API"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="MIT"
-homepage="https://github.com/sckott/habanero"
-distfiles="${PYPI_SITE}/h/habanero/habanero-${version}.tar.gz"
-checksum=806c74298e0fb8a838514307ef3eca73685a968b8efd00e5dfe1ea604200f59d
-
-post_install() {
-	vlicense docs/license.rst
-}
-
-python3-habanero_package() {
-	archs=noarch
-	pycompile_module="habanero"
-	depends="python3-requests"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense docs/license.rst
-	}
-}
diff --git a/srcpkgs/python3-habanero b/srcpkgs/python3-habanero
deleted file mode 120000
index 947f4479622..00000000000
--- a/srcpkgs/python3-habanero
+++ /dev/null
@@ -1 +0,0 @@
-python-habanero
\ No newline at end of file
diff --git a/srcpkgs/python3-habanero/template b/srcpkgs/python3-habanero/template
new file mode 100644
index 00000000000..b0b6d938a27
--- /dev/null
+++ b/srcpkgs/python3-habanero/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-habanero'
+pkgname=python3-habanero
+version=0.6.2
+revision=3
+wrksrc="habanero-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests"
+short_desc="Python3 low level client for Crossref Search API"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="MIT"
+homepage="https://github.com/sckott/habanero"
+distfiles="${PYPI_SITE}/h/habanero/habanero-${version}.tar.gz"
+checksum=806c74298e0fb8a838514307ef3eca73685a968b8efd00e5dfe1ea604200f59d
+
+post_install() {
+	vlicense docs/license.rst
+}

From 5d04a1fb480f2a307276ead1bd889eb597d91966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:32:37 +0700
Subject: [PATCH 046/109] python-h11: drop package

---
 srcpkgs/python-h11/template  | 30 ------------------------------
 srcpkgs/python3-h11          |  1 -
 srcpkgs/python3-h11/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-h11/template
 delete mode 120000 srcpkgs/python3-h11
 create mode 100644 srcpkgs/python3-h11/template

diff --git a/srcpkgs/python-h11/template b/srcpkgs/python-h11/template
deleted file mode 100644
index 7f2d2c5fa8a..00000000000
--- a/srcpkgs/python-h11/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-h11'
-pkgname=python-h11
-version=0.9.0
-revision=2
-archs=noarch
-wrksrc=h11-${version}
-build_style=python-module
-pycompile_module="h11"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Bring-your-own-I/O implementation of HTTP/1.1 (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="MIT"
-homepage="https://github.com/python-hyper/h11"
-distfiles="https://github.com/python-hyper/h11/archive/v${version}.tar.gz"
-checksum=77b543bed05fb7b1e267dc8552d502b6f9f69d3812c8d58d0a56d0f148d2ae06
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-h11_package() {
-	archs=noarch
-	pycompile_module="h11"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-h11 b/srcpkgs/python3-h11
deleted file mode 120000
index d3c0773985b..00000000000
--- a/srcpkgs/python3-h11
+++ /dev/null
@@ -1 +0,0 @@
-python-h11
\ No newline at end of file
diff --git a/srcpkgs/python3-h11/template b/srcpkgs/python3-h11/template
new file mode 100644
index 00000000000..99ec82f0099
--- /dev/null
+++ b/srcpkgs/python3-h11/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-h11'
+pkgname=python3-h11
+version=0.9.0
+revision=3
+wrksrc=h11-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Bring-your-own-I/O implementation of HTTP/1.1 (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/python-hyper/h11"
+distfiles="https://github.com/python-hyper/h11/archive/v${version}.tar.gz"
+checksum=77b543bed05fb7b1e267dc8552d502b6f9f69d3812c8d58d0a56d0f148d2ae06
+
+post_install() {
+	vlicense LICENSE.txt
+}

From b16f881adb8c13b6c8e7fc52e735a46def21c541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:33:00 +0700
Subject: [PATCH 047/109] python-gogs-client: drop package

---
 srcpkgs/python-gogs-client/template  | 33 ----------------------------
 srcpkgs/python3-gogs-client          |  1 -
 srcpkgs/python3-gogs-client/template | 20 +++++++++++++++++
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-gogs-client/template
 delete mode 120000 srcpkgs/python3-gogs-client
 create mode 100644 srcpkgs/python3-gogs-client/template

diff --git a/srcpkgs/python-gogs-client/template b/srcpkgs/python-gogs-client/template
deleted file mode 100644
index 027135d430c..00000000000
--- a/srcpkgs/python-gogs-client/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-gogs-client'
-pkgname=python-gogs-client
-version=1.0.6
-revision=4
-archs=noarch
-wrksrc="gogs_client-${version}"
-build_style=python-module
-pycompile_module="gogs_client"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-future python-requests python-attrs"
-short_desc="Python2 library for interacting with a gogs server"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-homepage="https://github.com/unfoldingWord-dev/python-gogs-client"
-license="MIT"
-distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz"
-checksum=4bd585ff86f6d70a245cea3b9b9756205bdaa9f512b314c47f715842970b3d3f
-
-post_install() {
-	vlicense LICENSE.txt
-	# remove tests directory polluting site-packages
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests
-}
-
-python3-gogs-client_package() {
-	archs=noarch
-	depends="python3-future python3-requests python3-attrs"
-	pycompile_module="gogs_client"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-gogs-client b/srcpkgs/python3-gogs-client
deleted file mode 120000
index 24a119bfc28..00000000000
--- a/srcpkgs/python3-gogs-client
+++ /dev/null
@@ -1 +0,0 @@
-python-gogs-client
\ No newline at end of file
diff --git a/srcpkgs/python3-gogs-client/template b/srcpkgs/python3-gogs-client/template
new file mode 100644
index 00000000000..ce29cc9dced
--- /dev/null
+++ b/srcpkgs/python3-gogs-client/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-gogs-client'
+pkgname=python3-gogs-client
+version=1.0.6
+revision=5
+wrksrc="gogs_client-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-future python3-requests python3-attrs"
+short_desc="Python3 library for interacting with a gogs server"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="MIT"
+homepage="https://github.com/unfoldingWord-dev/python-gogs-client"
+distfiles="${PYPI_SITE}/g/gogs_client/gogs_client-${version}.tar.gz"
+checksum=4bd585ff86f6d70a245cea3b9b9756205bdaa9f512b314c47f715842970b3d3f
+
+post_install() {
+	vlicense LICENSE.txt
+	# remove tests directory polluting site-packages
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests
+}

From 00a89e12b1022ed8ec2293f484d606c3e6baff9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:33:19 +0700
Subject: [PATCH 048/109] python-gnupg: drop package

---
 srcpkgs/python-gnupg/template                 | 28 -------------------
 srcpkgs/python3-gnupg                         |  1 -
 srcpkgs/python3-gnupg/template                | 17 +++++++++++
 .../{python-gnupg => python3-gnupg}/update    |  0
 4 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/python-gnupg/template
 delete mode 120000 srcpkgs/python3-gnupg
 create mode 100644 srcpkgs/python3-gnupg/template
 rename srcpkgs/{python-gnupg => python3-gnupg}/update (100%)

diff --git a/srcpkgs/python-gnupg/template b/srcpkgs/python-gnupg/template
deleted file mode 100644
index b5dd94bf8e1..00000000000
--- a/srcpkgs/python-gnupg/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-gnupg'
-pkgname=python-gnupg
-version=0.4.6
-revision=1
-archs=noarch
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python gnupg"
-short_desc="Python2 wrapper for GnuPG"
-maintainer="Lon Willett <xgit@lonw.net>"
-license="BSD-3-Clause"
-homepage="https://bitbucket.org/vinay.sajip/python-gnupg"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-gnupg_package() {
-	depends="python3 gnupg"
-	short_desc="${short_desc/Python2/Python3}"
-	archs=noarch
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-gnupg b/srcpkgs/python3-gnupg
deleted file mode 120000
index 03e85363c37..00000000000
--- a/srcpkgs/python3-gnupg
+++ /dev/null
@@ -1 +0,0 @@
-python-gnupg
\ No newline at end of file
diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
new file mode 100644
index 00000000000..122f954f89c
--- /dev/null
+++ b/srcpkgs/python3-gnupg/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-gnupg'
+pkgname=python3-gnupg
+version=0.4.6
+revision=2
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 gnupg"
+short_desc="Python3 wrapper for GnuPG"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="BSD-3-Clause"
+homepage="https://bitbucket.org/vinay.sajip/python-gnupg"
+distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-gnupg/update b/srcpkgs/python3-gnupg/update
similarity index 100%
rename from srcpkgs/python-gnupg/update
rename to srcpkgs/python3-gnupg/update

From 81966c0d57d78080a4bad8ee680d0de509c78770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:34:16 +0700
Subject: [PATCH 049/109] python-github3: drop package

---
 srcpkgs/python-github3/template               | 32 -------------------
 srcpkgs/python3-github3                       |  1 -
 srcpkgs/python3-github3/template              | 19 +++++++++++
 .../update                                    |  0
 4 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-github3/template
 delete mode 120000 srcpkgs/python3-github3
 create mode 100644 srcpkgs/python3-github3/template
 rename srcpkgs/{python-github3 => python3-github3}/update (100%)

diff --git a/srcpkgs/python-github3/template b/srcpkgs/python-github3/template
deleted file mode 100644
index 425fe1b7362..00000000000
--- a/srcpkgs/python-github3/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-github3'
-pkgname=python-github3
-version=1.3.0
-revision=2
-archs=noarch
-wrksrc="github3.py-${version}"
-build_style=python-module
-pycompile_module="github3"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-requests python-uritemplate"
-short_desc="Wrapper for GitHub's API (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="BSD-3-Clause"
-homepage="https://github3py.readthedocs.org"
-changelog="https://raw.githubusercontent.com/sigmavirus24/github3.py/master/docs/source/release-notes/${version}.rst"
-distfiles="${PYPI_SITE}/g/github3.py/github3.py-${version}.tar.gz"
-checksum=15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-github3_package() {
-	archs=noarch
-	depends="python3-requests python3-uritemplate"
-	pycompile_module="github3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-github3 b/srcpkgs/python3-github3
deleted file mode 120000
index 7a5d11df803..00000000000
--- a/srcpkgs/python3-github3
+++ /dev/null
@@ -1 +0,0 @@
-python-github3
\ No newline at end of file
diff --git a/srcpkgs/python3-github3/template b/srcpkgs/python3-github3/template
new file mode 100644
index 00000000000..8873ca5f760
--- /dev/null
+++ b/srcpkgs/python3-github3/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-github3'
+pkgname=python3-github3
+version=1.3.0
+revision=3
+wrksrc="github3.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-uritemplate"
+short_desc="Wrapper for GitHub's API (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="BSD-3-Clause"
+homepage="https://github3py.readthedocs.org"
+changelog="https://raw.githubusercontent.com/sigmavirus24/github3.py/master/docs/source/release-notes/${version}.rst"
+distfiles="${PYPI_SITE}/g/github3.py/github3.py-${version}.tar.gz"
+checksum=15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-github3/update b/srcpkgs/python3-github3/update
similarity index 100%
rename from srcpkgs/python-github3/update
rename to srcpkgs/python3-github3/update

From ad4589cb60ec6b3e8a90c82f0d1e2ad282dca364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:34:56 +0700
Subject: [PATCH 050/109] python-click-threading: drop package

---
 srcpkgs/python-click-threading/template  | 31 ------------------------
 srcpkgs/python3-click-threading          |  1 -
 srcpkgs/python3-click-threading/template | 18 ++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-click-threading/template
 delete mode 120000 srcpkgs/python3-click-threading
 create mode 100644 srcpkgs/python3-click-threading/template

diff --git a/srcpkgs/python-click-threading/template b/srcpkgs/python-click-threading/template
deleted file mode 100644
index 49b4a4a9aae..00000000000
--- a/srcpkgs/python-click-threading/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-click-threading'
-pkgname=python-click-threading
-version=0.4.4
-revision=2
-archs=noarch
-wrksrc="click-threading-${version}"
-build_style="python-module"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-click python-futures"
-pycompile_module="click_threading"
-short_desc="Multithreaded Click apps made easy (Python2)"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="MIT"
-homepage="https://github.com/click-contrib/click-threading"
-distfiles="${PYPI_SITE}/c/click-threading/click-threading-${version}.tar.gz"
-checksum=b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-click-threading_package() {
-	archs=noarch
-	pycompile_module="click_threading"
-	depends="python3-click"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-click-threading b/srcpkgs/python3-click-threading
deleted file mode 120000
index 5bfcef2e127..00000000000
--- a/srcpkgs/python3-click-threading
+++ /dev/null
@@ -1 +0,0 @@
-python-click-threading
\ No newline at end of file
diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
new file mode 100644
index 00000000000..56928810364
--- /dev/null
+++ b/srcpkgs/python3-click-threading/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click-threading'
+pkgname=python3-click-threading
+version=0.4.4
+revision=3
+wrksrc="click-threading-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3-click"
+short_desc="Multithreaded Click apps made easy (Python3)"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-threading"
+distfiles="${PYPI_SITE}/c/click-threading/click-threading-${version}.tar.gz"
+checksum=b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7
+
+post_install() {
+	vlicense LICENSE
+}

From f758081902766c9543a742d2024cee044a2bd2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:35:10 +0700
Subject: [PATCH 051/109] python-futures: drop package

---
 srcpkgs/python-futures/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-futures/template

diff --git a/srcpkgs/python-futures/template b/srcpkgs/python-futures/template
deleted file mode 100644
index 12d1f4ae71f..00000000000
--- a/srcpkgs/python-futures/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-futures'
-pkgname=python-futures
-version=3.2.0
-revision=1
-archs=noarch
-wrksrc="futures-${version}"
-build_style=python2-module
-pycompile_module="concurrent"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the concurrent.futures package from Python 3.2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="PSF"
-homepage="https://github.com/agronholm/pythonfutures"
-distfiles="${PYPI_SITE}/f/futures/futures-${version}.tar.gz"
-checksum=9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265
-
-post_install() {
-	vlicense LICENSE
-}

From d56d35374bc885daf50cb733fb04617b1e42c144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:35:41 +0700
Subject: [PATCH 052/109] python-functools32: drop package

---
 srcpkgs/python-functools32/template | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 srcpkgs/python-functools32/template

diff --git a/srcpkgs/python-functools32/template b/srcpkgs/python-functools32/template
deleted file mode 100644
index 53f9d69a576..00000000000
--- a/srcpkgs/python-functools32/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-functools32'
-pkgname=python-functools32
-version=3.2.3.post2
-revision=1
-archs=noarch
-wrksrc="functools32-${version/.post/-}"
-build_style=python2-module
-pycompile_module="functools32"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of the functools module from Python 3.2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://github.com/MiCHiLU/python-functools32"
-distfiles="${PYPI_SITE}/f/functools32/functools32-${version/.post/-}.tar.gz"
-checksum=f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d

From 35004e1ad8a9079bcb2fe0dccf9711ac65763fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:37:28 +0700
Subject: [PATCH 053/109] python-flaky: drop package

---
 srcpkgs/python-flaky/template  | 26 --------------------------
 srcpkgs/python3-flaky          |  1 -
 srcpkgs/python3-flaky/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-flaky/template
 delete mode 120000 srcpkgs/python3-flaky
 create mode 100644 srcpkgs/python3-flaky/template

diff --git a/srcpkgs/python-flaky/template b/srcpkgs/python-flaky/template
deleted file mode 100644
index e8e681421f7..00000000000
--- a/srcpkgs/python-flaky/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-flaky'
-pkgname=python-flaky
-version=3.6.1
-revision=2
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="flaky"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/box/flaky"
-distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
-checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698
-
-python3-flaky_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="flaky"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-flaky b/srcpkgs/python3-flaky
deleted file mode 120000
index f6467cfa1d3..00000000000
--- a/srcpkgs/python3-flaky
+++ /dev/null
@@ -1 +0,0 @@
-python-flaky
\ No newline at end of file
diff --git a/srcpkgs/python3-flaky/template b/srcpkgs/python3-flaky/template
new file mode 100644
index 00000000000..9441a9a4322
--- /dev/null
+++ b/srcpkgs/python3-flaky/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-flaky'
+pkgname=python3-flaky
+version=3.6.1
+revision=3
+wrksrc="flaky-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Plugin for nose/py.test that automatically reruns flaky tests (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/box/flaky"
+distfiles="${PYPI_SITE}/f/flaky/flaky-${version}.tar.gz"
+checksum=8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698

From cea64d501f505bd0ad86da3793b2687230bed3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:38:08 +0700
Subject: [PATCH 054/109] python-filetype: drop package

---
 srcpkgs/python-filetype/template  | 33 -------------------------------
 srcpkgs/python3-filetype          |  1 -
 srcpkgs/python3-filetype/template | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-filetype/template
 delete mode 120000 srcpkgs/python3-filetype
 create mode 100644 srcpkgs/python3-filetype/template

diff --git a/srcpkgs/python-filetype/template b/srcpkgs/python-filetype/template
deleted file mode 100644
index 10b974794b5..00000000000
--- a/srcpkgs/python-filetype/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-filetype'
-pkgname=python-filetype
-version=1.0.5
-revision=2
-archs=noarch
-wrksrc="filetype-${version}"
-build_style=python-module
-pycompile_module="filetype"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 package to infer file types"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="MIT"
-homepage="https://github.com/h2non/filetype.py"
-distfiles="${PYPI_SITE}/f/filetype/filetype-${version}.tar.gz"
-checksum=17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7
-
-post_install() {
-	vlicense LICENSE
-	rm -rf ${DESTDIR}/${py3_sitelib}/examples
-	rm -rf ${DESTDIR}/${py2_sitelib}/examples
-}
-
-python3-filetype_package() {
-	archs=noarch
-	pycompile_module="filetype"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-filetype b/srcpkgs/python3-filetype
deleted file mode 120000
index 334b708d789..00000000000
--- a/srcpkgs/python3-filetype
+++ /dev/null
@@ -1 +0,0 @@
-python-filetype
\ No newline at end of file
diff --git a/srcpkgs/python3-filetype/template b/srcpkgs/python3-filetype/template
new file mode 100644
index 00000000000..d9fcea8be46
--- /dev/null
+++ b/srcpkgs/python3-filetype/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-filetype'
+pkgname=python3-filetype
+version=1.0.5
+revision=3
+wrksrc="filetype-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 package to infer file types"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="MIT"
+homepage="https://github.com/h2non/filetype.py"
+distfiles="${PYPI_SITE}/f/filetype/filetype-${version}.tar.gz"
+checksum=17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7
+
+post_install() {
+	vlicense LICENSE
+	rm -rf ${DESTDIR}/${py3_sitelib}/examples
+	rm -rf ${DESTDIR}/${py2_sitelib}/examples
+}

From 39185bc870201dc08bbabfad9722fbb964840120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Sep 2020 21:40:15 +0700
Subject: [PATCH 055/109] python-exifread: drop package

---
 srcpkgs/python-exifread/template  | 35 -------------------------------
 srcpkgs/python3-exifread          |  1 -
 srcpkgs/python3-exifread/template | 24 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-exifread/template
 delete mode 120000 srcpkgs/python3-exifread
 create mode 100644 srcpkgs/python3-exifread/template

diff --git a/srcpkgs/python-exifread/template b/srcpkgs/python-exifread/template
deleted file mode 100644
index cd98e20c08e..00000000000
--- a/srcpkgs/python-exifread/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-exifread'
-pkgname=python-exifread
-version=2.3.1
-revision=1
-wrksrc="exif-py-${version}"
-build_style="python-module"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python module to extract Exif metadata (Python2)"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="BSD-3-Clause"
-homepage="https://github.com/ianare/exif-py"
-distfiles="https://github.com/ianare/exif-py/archive/${version}.tar.gz"
-checksum=b6b012d72df9af6e8a4fb439914f3a293f0a63c2087c21e94f5b6e1221de45f4
-alternatives="EXIF:EXIF.py:/usr/bin/EXIF.py2"
-
-pre_build() {
-	# Upstream didn't update version in this file
-	sed -i "s/2.1.2/${version}/" exifread/__init__.py
-}
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-exifread_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="EXIF:EXIF.py:/usr/bin/EXIF.py3"
-	pkg_install() {
-		vmove usr/bin/EXIF.py3
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-exifread b/srcpkgs/python3-exifread
deleted file mode 120000
index 652744bb61e..00000000000
--- a/srcpkgs/python3-exifread
+++ /dev/null
@@ -1 +0,0 @@
-python-exifread
\ No newline at end of file
diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template
new file mode 100644
index 00000000000..57c44a60ca4
--- /dev/null
+++ b/srcpkgs/python3-exifread/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-exifread'
+pkgname=python3-exifread
+version=2.3.1
+revision=2
+wrksrc="exif-py-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python 3 module to extract Exif metadata"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="BSD-3-Clause"
+homepage="https://github.com/ianare/exif-py"
+distfiles="https://github.com/ianare/exif-py/archive/${version}.tar.gz"
+checksum=b6b012d72df9af6e8a4fb439914f3a293f0a63c2087c21e94f5b6e1221de45f4
+conflicts="python-exifread>=0"
+
+pre_build() {
+	# Upstream didn't update version in this file
+	sed -i "s/2.1.2/${version}/" exifread/__init__.py
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 43e04d7d7864957074149f279b056eb00813f6d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:39:27 +0700
Subject: [PATCH 056/109] python-enzyme: drop package

---
 srcpkgs/python-enzyme/template  | 26 --------------------------
 srcpkgs/python3-enzyme          |  1 -
 srcpkgs/python3-enzyme/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-enzyme/template
 delete mode 120000 srcpkgs/python3-enzyme
 create mode 100644 srcpkgs/python3-enzyme/template

diff --git a/srcpkgs/python-enzyme/template b/srcpkgs/python-enzyme/template
deleted file mode 100644
index f28f40b0319..00000000000
--- a/srcpkgs/python-enzyme/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-enzyme'
-pkgname=python-enzyme
-version=0.4.1
-revision=2
-archs=noarch
-wrksrc="enzyme-${version}"
-build_style=python-module
-pycompile_module="enzyme"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Enzyme is a Python module to parse video metadata (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="Apache-2.0"
-homepage="https://github.com/Diaoul/enzyme"
-distfiles="${PYPI_SITE}/e/enzyme/enzyme-${version}.tar.gz"
-checksum=f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb
-
-python3-enzyme_package() {
-	archs=noarch
-	pycompile_module="enzyme"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-enzyme b/srcpkgs/python3-enzyme
deleted file mode 120000
index 3e6774516c9..00000000000
--- a/srcpkgs/python3-enzyme
+++ /dev/null
@@ -1 +0,0 @@
-python-enzyme
\ No newline at end of file
diff --git a/srcpkgs/python3-enzyme/template b/srcpkgs/python3-enzyme/template
new file mode 100644
index 00000000000..4fb13e7aa27
--- /dev/null
+++ b/srcpkgs/python3-enzyme/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-enzyme'
+pkgname=python3-enzyme
+version=0.4.1
+revision=3
+wrksrc="enzyme-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Enzyme is a Python module to parse video metadata (Python3)"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="Apache-2.0"
+homepage="https://github.com/Diaoul/enzyme"
+distfiles="${PYPI_SITE}/e/enzyme/enzyme-${version}.tar.gz"
+checksum=f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb

From d8bf1e86d67f0d28bd0aab45ddeeaa6021833102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:39:43 +0700
Subject: [PATCH 057/109] python-envdir: drop package

---
 srcpkgs/python-envdir/template  | 38 ---------------------------------
 srcpkgs/python3-envdir          |  1 -
 srcpkgs/python3-envdir/template | 19 +++++++++++++++++
 3 files changed, 19 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/python-envdir/template
 delete mode 120000 srcpkgs/python3-envdir
 create mode 100644 srcpkgs/python3-envdir/template

diff --git a/srcpkgs/python-envdir/template b/srcpkgs/python-envdir/template
deleted file mode 100644
index b8cccad60ac..00000000000
--- a/srcpkgs/python-envdir/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-envdir'
-pkgname=python-envdir
-version=1.0.1
-revision=3
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="envdir"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 port of daemontools' envdir"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jezdez/envdir"
-distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz"
-checksum=779a308a07a673f391db87ef639d4b0f9921238bba02dd3e98c3281520faee95
-alternatives="
- envdir:envdir:/usr/bin/envdir2
- envdir:envshell:/usr/bin/envshell2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-envdir_package() {
-	alternatives="
-	 envdir:envdir:/usr/bin/envdir3
-	 envdir:envshell:/usr/bin/envshell3"
-	archs=noarch
-	pycompile_module="envdir"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-envdir b/srcpkgs/python3-envdir
deleted file mode 120000
index c07d3a24f31..00000000000
--- a/srcpkgs/python3-envdir
+++ /dev/null
@@ -1 +0,0 @@
-python-envdir
\ No newline at end of file
diff --git a/srcpkgs/python3-envdir/template b/srcpkgs/python3-envdir/template
new file mode 100644
index 00000000000..65975f4a61c
--- /dev/null
+++ b/srcpkgs/python3-envdir/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-envdir'
+pkgname=python3-envdir
+version=1.0.1
+revision=4
+wrksrc="envdir-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Python3 port of daemontools' envdir"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/jezdez/envdir"
+distfiles="https://github.com/jezdez/envdir/archive/${version}.tar.gz"
+checksum=779a308a07a673f391db87ef639d4b0f9921238bba02dd3e98c3281520faee95
+conflicts="python-envdir>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 3e4612b4949e5a24505ebb92e77860f00d83e005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:40:51 +0700
Subject: [PATCH 058/109] python-entrypoints: drop package

---
 srcpkgs/python-entrypoints/template           | 37 -------------------
 srcpkgs/python3-entrypoints                   |  1 -
 .../patches/setup.py.patch                    |  0
 srcpkgs/python3-entrypoints/template          | 22 +++++++++++
 4 files changed, 22 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-entrypoints/template
 delete mode 120000 srcpkgs/python3-entrypoints
 rename srcpkgs/{python-entrypoints => python3-entrypoints}/patches/setup.py.patch (100%)
 create mode 100644 srcpkgs/python3-entrypoints/template

diff --git a/srcpkgs/python-entrypoints/template b/srcpkgs/python-entrypoints/template
deleted file mode 100644
index 6070650f35d..00000000000
--- a/srcpkgs/python-entrypoints/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-entrypoints'
-pkgname=python-entrypoints
-version=0.3
-revision=2
-archs=noarch
-wrksrc="entrypoints-${version}"
-build_style=python-module
-pycompile_module="entrypoints.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-backports.configparser"
-short_desc="Discover and load entry points from installed packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/takluyver/entrypoints"
-distfiles="https://github.com/takluyver/entrypoints/archive/${version}.tar.gz"
-checksum=f26eddc371e37d8e9f6663b77524d6731567f005bd1e4ac950c0e33c48fbc065
-
-pre_build() {
-	sed -i "s|@VERSION@|${version}|" setup.py
-}
-post_install() {
-	for pyver in $python_versions; do
-		vinstall entrypoints.py 644 usr/lib/python${pyver}/site-packages
-	done
-	vlicense LICENSE
-}
-
-python3-entrypoints_package() {
-	archs=noarch
-	pycompile_module="entrypoints.py"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-entrypoints b/srcpkgs/python3-entrypoints
deleted file mode 120000
index 33316dfeacf..00000000000
--- a/srcpkgs/python3-entrypoints
+++ /dev/null
@@ -1 +0,0 @@
-python-entrypoints
\ No newline at end of file
diff --git a/srcpkgs/python-entrypoints/patches/setup.py.patch b/srcpkgs/python3-entrypoints/patches/setup.py.patch
similarity index 100%
rename from srcpkgs/python-entrypoints/patches/setup.py.patch
rename to srcpkgs/python3-entrypoints/patches/setup.py.patch
diff --git a/srcpkgs/python3-entrypoints/template b/srcpkgs/python3-entrypoints/template
new file mode 100644
index 00000000000..85c910e46c1
--- /dev/null
+++ b/srcpkgs/python3-entrypoints/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-entrypoints'
+pkgname=python3-entrypoints
+version=0.3
+revision=3
+wrksrc="entrypoints-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Discover and load entry points from installed packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/takluyver/entrypoints"
+distfiles="https://github.com/takluyver/entrypoints/archive/${version}.tar.gz"
+checksum=f26eddc371e37d8e9f6663b77524d6731567f005bd1e4ac950c0e33c48fbc065
+
+pre_build() {
+	vsed -i "s|@VERSION@|${version}|" setup.py
+}
+post_install() {
+	vinstall entrypoints.py 644 usr/lib/python${py3_ver}/site-packages
+	vlicense LICENSE
+}

From 63ba7dcbd417a19c7dec715fbd54a8281eb22b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:51:00 +0700
Subject: [PATCH 059/109] python-empy: drop package

---
 srcpkgs/python3-empy                          |  1 -
 .../{python-empy => python3-empy}/template    | 24 +++++--------------
 srcpkgs/{python-empy => python3-empy}/update  |  0
 3 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-empy
 rename srcpkgs/{python-empy => python3-empy}/template (51%)
 rename srcpkgs/{python-empy => python3-empy}/update (100%)

diff --git a/srcpkgs/python3-empy b/srcpkgs/python3-empy
deleted file mode 120000
index 55ee445c634..00000000000
--- a/srcpkgs/python3-empy
+++ /dev/null
@@ -1 +0,0 @@
-python-empy
\ No newline at end of file
diff --git a/srcpkgs/python-empy/template b/srcpkgs/python3-empy/template
similarity index 51%
rename from srcpkgs/python-empy/template
rename to srcpkgs/python3-empy/template
index 4668a9cc814..0ce3edb677e 100644
--- a/srcpkgs/python-empy/template
+++ b/srcpkgs/python3-empy/template
@@ -1,13 +1,11 @@
-# Template file for 'python-empy'
-pkgname=python-empy
+# Template file for 'python3-empy'
+pkgname=python3-empy
 version=3.3.4
-revision=2
-archs=noarch
+revision=3
 wrksrc="empy-${version}"
-build_style=python-module
-pycompile_module="EmPy"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
 short_desc="Powerful and robust templating system for Python"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="LGPL-3.0-or-later"
@@ -18,13 +16,3 @@ checksum=9126211471fc7ff83fdd40beca93eb6de5681758fbe68b4cf8af6326259df1b1
 do_check() {
 	./test.sh
 }
-
-python3-empy_package() {
-	archs=noarch
-	pycompile_module="EmPy"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python-empy/update b/srcpkgs/python3-empy/update
similarity index 100%
rename from srcpkgs/python-empy/update
rename to srcpkgs/python3-empy/update

From c38bdd3b398d1eae8f54d5105207c5569a4f4c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:51:30 +0700
Subject: [PATCH 060/109] python-dominate: drop package

---
 srcpkgs/python-dominate/template  | 22 ----------------------
 srcpkgs/python3-dominate          |  1 -
 srcpkgs/python3-dominate/template | 13 +++++++++++++
 3 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python-dominate/template
 delete mode 120000 srcpkgs/python3-dominate
 create mode 100644 srcpkgs/python3-dominate/template

diff --git a/srcpkgs/python-dominate/template b/srcpkgs/python-dominate/template
deleted file mode 100644
index 77fa674d156..00000000000
--- a/srcpkgs/python-dominate/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-dominate'
-pkgname=python-dominate
-version=2.5.2
-revision=1
-archs=noarch
-wrksrc="dominate-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Library for creating and manipulating HTML (Python2)"
-maintainer="Benjamín Albiñana <benalb@gmail.com>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/Knio/dominate"
-distfiles="https://github.com/Knio/dominate/archive/${version}.tar.gz"
-checksum=a184e19ca36646a85ec40b83fe3762c08834ffe51499ec436eeb6646edde36ac
-
-python3-dominate_package() {
-	archs=noarch
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-dominate b/srcpkgs/python3-dominate
deleted file mode 120000
index 25538723ef6..00000000000
--- a/srcpkgs/python3-dominate
+++ /dev/null
@@ -1 +0,0 @@
-python-dominate/
\ No newline at end of file
diff --git a/srcpkgs/python3-dominate/template b/srcpkgs/python3-dominate/template
new file mode 100644
index 00000000000..225d5042db1
--- /dev/null
+++ b/srcpkgs/python3-dominate/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-dominate'
+pkgname=python3-dominate
+version=2.5.2
+revision=2
+wrksrc="dominate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Library for creating and manipulating HTML (Python3)"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/Knio/dominate"
+distfiles="https://github.com/Knio/dominate/archive/${version}.tar.gz"
+checksum=a184e19ca36646a85ec40b83fe3762c08834ffe51499ec436eeb6646edde36ac

From f860d6104d7190a977bea01a0e65081e8ff6905e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:52:45 +0700
Subject: [PATCH 061/109] python-docopt: drop package

---
 srcpkgs/python-docopt/template  | 31 -------------------------------
 srcpkgs/python3-docopt          |  1 -
 srcpkgs/python3-docopt/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-docopt/template
 delete mode 120000 srcpkgs/python3-docopt
 create mode 100644 srcpkgs/python3-docopt/template

diff --git a/srcpkgs/python-docopt/template b/srcpkgs/python-docopt/template
deleted file mode 100644
index 48e5f86c1e0..00000000000
--- a/srcpkgs/python-docopt/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-docopt'
-pkgname=python-docopt
-version=0.6.2
-revision=5
-archs=noarch
-wrksrc="docopt-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="docopt.py"
-short_desc="Pythonic argument parser, that will make you smile (Python2)"
-maintainer="Sergi Alvarez <pancake@nopcode.org>"
-homepage="http://docopt.org/"
-license="MIT"
-distfiles="${PYPI_SITE}/d/docopt/docopt-${version}.tar.gz"
-checksum=49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
-
-post_install() {
-	vlicense LICENSE-MIT
-}
-
-python3-docopt_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="docopt.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE-MIT
-	}
-}
diff --git a/srcpkgs/python3-docopt b/srcpkgs/python3-docopt
deleted file mode 120000
index 1170806e939..00000000000
--- a/srcpkgs/python3-docopt
+++ /dev/null
@@ -1 +0,0 @@
-python-docopt
\ No newline at end of file
diff --git a/srcpkgs/python3-docopt/template b/srcpkgs/python3-docopt/template
new file mode 100644
index 00000000000..46be2c428d2
--- /dev/null
+++ b/srcpkgs/python3-docopt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-docopt'
+pkgname=python3-docopt
+version=0.6.2
+revision=6
+wrksrc="docopt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pythonic argument parser, that will make you smile (Python3)"
+maintainer="Sergi Alvarez <pancake@nopcode.org>"
+license="MIT"
+homepage="http://docopt.org/"
+distfiles="${PYPI_SITE}/d/docopt/docopt-${version}.tar.gz"
+checksum=49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
+
+post_install() {
+	vlicense LICENSE-MIT
+}

From 5780442c476e5122343f3cab692a6063d443918f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:53:08 +0700
Subject: [PATCH 062/109] python-dockerpty: drop package

---
 srcpkgs/python-dockerpty/template  | 26 --------------------------
 srcpkgs/python3-dockerpty          |  1 -
 srcpkgs/python3-dockerpty/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-dockerpty/template
 delete mode 120000 srcpkgs/python3-dockerpty
 create mode 100644 srcpkgs/python3-dockerpty/template

diff --git a/srcpkgs/python-dockerpty/template b/srcpkgs/python-dockerpty/template
deleted file mode 100644
index 4a0b3a7a33f..00000000000
--- a/srcpkgs/python-dockerpty/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-dockerpty'
-pkgname=python-dockerpty
-version=0.4.1
-revision=4
-archs=noarch
-wrksrc="dockerpty-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-docker"
-pycompile_module="dockerpty"
-short_desc="Python2 library to use the pseudo-tty of a docker container"
-maintainer="Sergi Alvarez <pancake@nopcode.org>"
-homepage="https://github.com/d11wtq/dockerpty"
-license="Apache-2.0"
-distfiles="${PYPI_SITE}/d/dockerpty/dockerpty-${version}.tar.gz"
-checksum=69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce
-
-python3-dockerpty_package() {
-	archs=noarch
-	depends="python3-six python3-docker"
-	pycompile_module="dockerpty"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-dockerpty b/srcpkgs/python3-dockerpty
deleted file mode 120000
index 2e00ef1a0fc..00000000000
--- a/srcpkgs/python3-dockerpty
+++ /dev/null
@@ -1 +0,0 @@
-python-dockerpty
\ No newline at end of file
diff --git a/srcpkgs/python3-dockerpty/template b/srcpkgs/python3-dockerpty/template
new file mode 100644
index 00000000000..2ad010f0b10
--- /dev/null
+++ b/srcpkgs/python3-dockerpty/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-dockerpty'
+pkgname=python3-dockerpty
+version=0.4.1
+revision=5
+wrksrc="dockerpty-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-docker"
+short_desc="Python3 library to use the pseudo-tty of a docker container"
+maintainer="Sergi Alvarez <pancake@nopcode.org>"
+license="Apache-2.0"
+homepage="https://github.com/d11wtq/dockerpty"
+distfiles="${PYPI_SITE}/d/dockerpty/dockerpty-${version}.tar.gz"
+checksum=69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce

From 4bf5796228d960e5cf94e24d2f85ad916b846c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:53:58 +0700
Subject: [PATCH 063/109] python-defusedxml: drop package

---
 srcpkgs/python-defusedxml/template  | 31 -----------------------------
 srcpkgs/python3-defusedxml          |  1 -
 srcpkgs/python3-defusedxml/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-defusedxml/template
 delete mode 120000 srcpkgs/python3-defusedxml
 create mode 100644 srcpkgs/python3-defusedxml/template

diff --git a/srcpkgs/python-defusedxml/template b/srcpkgs/python-defusedxml/template
deleted file mode 100644
index 96234eb18c7..00000000000
--- a/srcpkgs/python-defusedxml/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-defusedxml'
-pkgname=python-defusedxml
-version=0.6.0
-revision=2
-archs=noarch
-wrksrc="defusedxml-${version}"
-build_style=python-module
-pycompile_module="defusedxml"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Defusing XML bombs and other exploits (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Python-2.0"
-homepage="https://github.com/tiran/defusedxml"
-distfiles="${PYPI_SITE}/d/defusedxml/defusedxml-${version}.tar.gz"
-checksum=f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-defusedxml_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="defusedxml"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-defusedxml b/srcpkgs/python3-defusedxml
deleted file mode 120000
index 537bcef0939..00000000000
--- a/srcpkgs/python3-defusedxml
+++ /dev/null
@@ -1 +0,0 @@
-python-defusedxml
\ No newline at end of file
diff --git a/srcpkgs/python3-defusedxml/template b/srcpkgs/python3-defusedxml/template
new file mode 100644
index 00000000000..a09539f4136
--- /dev/null
+++ b/srcpkgs/python3-defusedxml/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-defusedxml'
+pkgname=python3-defusedxml
+version=0.6.0
+revision=3
+wrksrc="defusedxml-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Defusing XML bombs and other exploits (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://github.com/tiran/defusedxml"
+distfiles="${PYPI_SITE}/d/defusedxml/defusedxml-${version}.tar.gz"
+checksum=f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5
+
+post_install() {
+	vlicense LICENSE
+}

From b731557fd712d9344a5e83b7d1a152e4eef7b3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:54:28 +0700
Subject: [PATCH 064/109] python-daemonize: drop package

---
 srcpkgs/python-daemonize/template  | 31 ------------------------------
 srcpkgs/python3-daemonize          |  1 -
 srcpkgs/python3-daemonize/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-daemonize/template
 delete mode 120000 srcpkgs/python3-daemonize
 create mode 100644 srcpkgs/python3-daemonize/template

diff --git a/srcpkgs/python-daemonize/template b/srcpkgs/python-daemonize/template
deleted file mode 100644
index efaf163e573..00000000000
--- a/srcpkgs/python-daemonize/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-daemonize'
-pkgname=python-daemonize
-version=2.5.0
-revision=2
-archs=noarch
-wrksrc="daemonize-${version}"
-build_style=python-module
-pycompile_module="daemonize.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Daemonize is a library for writing system daemons in Python (Python2)"
-maintainer="Luca Weiss <luca@z3ntu.xyz>"
-license="MIT"
-homepage="https://github.com/thesharp/daemonize"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=72ed6f7de45a50feea51017df8cf0829a903ca8b8d0b2453261dfbb1cdeb9481
-
-post_Install() {
-	vlicense LICENSE
-}
-
-python3-daemonize_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="daemonize.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-daemonize b/srcpkgs/python3-daemonize
deleted file mode 120000
index 0afab583a5e..00000000000
--- a/srcpkgs/python3-daemonize
+++ /dev/null
@@ -1 +0,0 @@
-python-daemonize
\ No newline at end of file
diff --git a/srcpkgs/python3-daemonize/template b/srcpkgs/python3-daemonize/template
new file mode 100644
index 00000000000..a0870abb617
--- /dev/null
+++ b/srcpkgs/python3-daemonize/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-daemonize'
+pkgname=python3-daemonize
+version=2.5.0
+revision=3
+wrksrc="daemonize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Daemonize is a library for writing system daemons in Python (Python3)"
+maintainer="Luca Weiss <luca@z3ntu.xyz>"
+license="MIT"
+homepage="https://github.com/thesharp/daemonize"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=72ed6f7de45a50feea51017df8cf0829a903ca8b8d0b2453261dfbb1cdeb9481
+
+post_Install() {
+	vlicense LICENSE
+}

From 0f03bdc9d8b06d91c075a2a3451ae4e3c83aa3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:54:59 +0700
Subject: [PATCH 065/109] python-cycler: drop package

---
 srcpkgs/python-cycler/template  | 31 -------------------------------
 srcpkgs/python3-cycler          |  1 -
 srcpkgs/python3-cycler/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-cycler/template
 delete mode 120000 srcpkgs/python3-cycler
 create mode 100644 srcpkgs/python3-cycler/template

diff --git a/srcpkgs/python-cycler/template b/srcpkgs/python-cycler/template
deleted file mode 100644
index 0b53c195dae..00000000000
--- a/srcpkgs/python-cycler/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-cycler'
-pkgname=python-cycler
-version=0.10.0
-revision=5
-archs=noarch
-wrksrc="cycler-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-pycompile_module="cycler.py"
-short_desc="Composable style cycles (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/matplotlib/cycler"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/C/Cycler/cycler-${version}.tar.gz"
-checksum=cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-cycler_package() {
-	archs=noarch
-	depends="python3-six"
-	pycompile_module="cycler.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-cycler b/srcpkgs/python3-cycler
deleted file mode 120000
index e62ba8c9689..00000000000
--- a/srcpkgs/python3-cycler
+++ /dev/null
@@ -1 +0,0 @@
-python-cycler
\ No newline at end of file
diff --git a/srcpkgs/python3-cycler/template b/srcpkgs/python3-cycler/template
new file mode 100644
index 00000000000..7c4083a39af
--- /dev/null
+++ b/srcpkgs/python3-cycler/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-cycler'
+pkgname=python3-cycler
+version=0.10.0
+revision=6
+wrksrc="cycler-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Composable style cycles (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/matplotlib/cycler"
+distfiles="${PYPI_SITE}/C/Cycler/cycler-${version}.tar.gz"
+checksum=cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8
+
+post_install() {
+	vlicense LICENSE
+}

From 30f563d1180ce59e19706ab8532fdcb46d24d905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:56:16 +0700
Subject: [PATCH 066/109] python-cssutils: drop package

---
 srcpkgs/python-cssutils/template  | 36 -------------------------------
 srcpkgs/python3-cssutils          |  1 -
 srcpkgs/python3-cssutils/template | 17 +++++++++++++++
 3 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/python-cssutils/template
 delete mode 120000 srcpkgs/python3-cssutils
 create mode 100644 srcpkgs/python3-cssutils/template

diff --git a/srcpkgs/python-cssutils/template b/srcpkgs/python-cssutils/template
deleted file mode 100644
index 5f08903b9a0..00000000000
--- a/srcpkgs/python-cssutils/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'python-cssutils'
-pkgname=python-cssutils
-version=1.0.2
-revision=3
-archs=noarch
-wrksrc="cssutils-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-pycompile_module="cssutils encutils"
-short_desc="A CSS Cascading Style Sheets library for Python2"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="LGPL-3"
-homepage="https://pypi.org/project/cssutils/"
-distfiles="${PYPI_SITE}/c/cssutils/cssutils-${version}.tar.gz"
-checksum=a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf
-
-alternatives="
- cssutils:csscapture:/usr/bin/csscapture2
- cssutils:csscombine:/usr/bin/csscombine2
- cssutils:cssparse:/usr/bin/cssparse2"
-
-python3-cssutils_package() {
-	alternatives="
-	 cssutils:csscapture:/usr/bin/csscapture3
-	 cssutils:csscombine:/usr/bin/csscombine3
-	 cssutils:cssparse:/usr/bin/cssparse3"
-	archs=noarch
-	pycompile_module="cssutils encutils"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-cssutils b/srcpkgs/python3-cssutils
deleted file mode 120000
index 137f7b229af..00000000000
--- a/srcpkgs/python3-cssutils
+++ /dev/null
@@ -1 +0,0 @@
-python-cssutils
\ No newline at end of file
diff --git a/srcpkgs/python3-cssutils/template b/srcpkgs/python3-cssutils/template
new file mode 100644
index 00000000000..7ed166c2b0c
--- /dev/null
+++ b/srcpkgs/python3-cssutils/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-cssutils'
+pkgname=python3-cssutils
+version=1.0.2
+revision=4
+wrksrc="cssutils-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="CSS Cascading Style Sheets library for Python3"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+# source files write 3.0-or-later, PKG-INFO writes 2.1
+license="LGPL-3.0-or-later"
+homepage="https://pypi.org/project/cssutils/"
+distfiles="${PYPI_SITE}/c/cssutils/cssutils-${version}.tar.gz"
+checksum=a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf
+
+conflicts="python-cssutils>=0"

From 8302f799a53867c1a5fcb85b93c3faa128feae7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 22:59:20 +0700
Subject: [PATCH 067/109] python-cram: drop package

---
 srcpkgs/python-cram/template  | 29 -----------------------------
 srcpkgs/python3-cram          |  1 -
 srcpkgs/python3-cram/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-cram/template
 delete mode 120000 srcpkgs/python3-cram
 create mode 100644 srcpkgs/python3-cram/template

diff --git a/srcpkgs/python-cram/template b/srcpkgs/python-cram/template
deleted file mode 100644
index 8c5d65fe260..00000000000
--- a/srcpkgs/python-cram/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cram'
-pkgname=python-cram
-version=0.7
-revision=3
-archs=noarch
-wrksrc="cram-${version}"
-build_style=python-module
-pycompile_module="cram"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Simple testing framework for commandline applications (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitheap.org/cram/"
-distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz"
-checksum=7da7445af2ce15b90aad5ec4792f857cef5786d71f14377e9eb994d8b8337f2f
-alternatives="cram:cram:/usr/bin/cram2"
-
-python3-cram_package() {
-	archs=noarch
-	pycompile_module="cram"
-	alternatives="cram:cram:/usr/bin/cram3"
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-cram b/srcpkgs/python3-cram
deleted file mode 120000
index b68583c2d34..00000000000
--- a/srcpkgs/python3-cram
+++ /dev/null
@@ -1 +0,0 @@
-python-cram
\ No newline at end of file
diff --git a/srcpkgs/python3-cram/template b/srcpkgs/python3-cram/template
new file mode 100644
index 00000000000..fc42482ede5
--- /dev/null
+++ b/srcpkgs/python3-cram/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-cram'
+pkgname=python3-cram
+version=0.7
+revision=4
+wrksrc="cram-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple testing framework for commandline applications (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://bitheap.org/cram/"
+distfiles="${PYPI_SITE}/c/cram/cram-${version}.tar.gz"
+checksum=7da7445af2ce15b90aad5ec4792f857cef5786d71f14377e9eb994d8b8337f2f
+conflicts="python-cram>=0"

From a376ee5208cbd8bcdf307d6fac9df5344cb1f2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:01:26 +0700
Subject: [PATCH 068/109] python-llfuse: drop package

---
 srcpkgs/python-llfuse/template  | 22 ----------------------
 srcpkgs/python3-llfuse          |  1 -
 srcpkgs/python3-llfuse/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python-llfuse/template
 delete mode 120000 srcpkgs/python3-llfuse
 create mode 100644 srcpkgs/python3-llfuse/template

diff --git a/srcpkgs/python-llfuse/template b/srcpkgs/python-llfuse/template
deleted file mode 100644
index b453c67e91d..00000000000
--- a/srcpkgs/python-llfuse/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-llfuse'
-pkgname=python-llfuse
-version=1.3.6
-revision=2
-wrksrc="llfuse-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel fuse-devel attr-devel"
-depends="python-contextlib2"
-short_desc="Python2 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
-
-python3-llfuse_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-llfuse b/srcpkgs/python3-llfuse
deleted file mode 120000
index 5751629a3c0..00000000000
--- a/srcpkgs/python3-llfuse
+++ /dev/null
@@ -1 +0,0 @@
-python-llfuse
\ No newline at end of file
diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template
new file mode 100644
index 00000000000..305924d199a
--- /dev/null
+++ b/srcpkgs/python3-llfuse/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-llfuse'
+pkgname=python3-llfuse
+version=1.3.6
+revision=2
+wrksrc="llfuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools 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

From 237ec0ffcae99a875c01e99fbbc5289073820054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:02:48 +0700
Subject: [PATCH 069/109] python-construct: drop package

---
 srcpkgs/python-construct/template  | 31 ------------------------------
 srcpkgs/python3-construct          |  1 -
 srcpkgs/python3-construct/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-construct/template
 delete mode 120000 srcpkgs/python3-construct
 create mode 100644 srcpkgs/python3-construct/template

diff --git a/srcpkgs/python-construct/template b/srcpkgs/python-construct/template
deleted file mode 100644
index d6d0b8010e2..00000000000
--- a/srcpkgs/python-construct/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-construct'
-pkgname=python-construct
-version=2.9.45
-revision=3
-archs=noarch
-wrksrc="construct-${version}"
-build_style=python-module
-pycompile_module="construct"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Powerful declarative symmetric parser/builder for binary data (Python2)"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://construct.readthedocs.org/"
-distfiles="${PYPI_SITE}/c/construct/construct-${version}.tar.gz"
-checksum=2271a0efd0798679dea825ff47e22a4c550456a5db0ba8baa82f7eae0af0118c
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-construct_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="construct"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-construct b/srcpkgs/python3-construct
deleted file mode 120000
index 1126a969071..00000000000
--- a/srcpkgs/python3-construct
+++ /dev/null
@@ -1 +0,0 @@
-python-construct
\ No newline at end of file
diff --git a/srcpkgs/python3-construct/template b/srcpkgs/python3-construct/template
new file mode 100644
index 00000000000..3fa3d0018e9
--- /dev/null
+++ b/srcpkgs/python3-construct/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-construct'
+pkgname=python3-construct
+version=2.9.45
+revision=4
+wrksrc="construct-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Powerful declarative symmetric parser/builder for binary data (Python3)"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://construct.readthedocs.org/"
+distfiles="${PYPI_SITE}/c/construct/construct-${version}.tar.gz"
+checksum=2271a0efd0798679dea825ff47e22a4c550456a5db0ba8baa82f7eae0af0118c
+
+post_install() {
+	vlicense LICENSE
+}

From 9614d498a56fa75f22b66ffccbeec29b41d4ef86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:03:23 +0700
Subject: [PATCH 070/109] python-colorama: drop package

---
 srcpkgs/python-colorama/template  | 31 -------------------------------
 srcpkgs/python3-colorama          |  1 -
 srcpkgs/python3-colorama/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-colorama/template
 delete mode 120000 srcpkgs/python3-colorama
 create mode 100644 srcpkgs/python3-colorama/template

diff --git a/srcpkgs/python-colorama/template b/srcpkgs/python-colorama/template
deleted file mode 100644
index 09562385243..00000000000
--- a/srcpkgs/python-colorama/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-colorama'
-pkgname=python-colorama
-version=0.4.1
-revision=2
-archs=noarch
-wrksrc="colorama-${version}"
-build_style=python-module
-pycompile_module="colorama"
-hostmakedepends="unzip python-setuptools python3-setuptools"
-depends="python"
-short_desc="Cross-platform colored terminal text (Python2)"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-3-Clause"
-homepage="https://github.com/tartley/colorama"
-distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
-checksum=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-colorama_package() {
-	archs=noarch
-	pycompile_module="colorama"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-colorama b/srcpkgs/python3-colorama
deleted file mode 120000
index 76099af1310..00000000000
--- a/srcpkgs/python3-colorama
+++ /dev/null
@@ -1 +0,0 @@
-python-colorama
\ No newline at end of file
diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
new file mode 100644
index 00000000000..0c5a1c44626
--- /dev/null
+++ b/srcpkgs/python3-colorama/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-colorama'
+pkgname=python3-colorama
+version=0.4.1
+revision=3
+wrksrc="colorama-${version}"
+build_style=python3-module
+hostmakedepends="unzip python3-setuptools"
+depends="python3"
+short_desc="Cross-platform colored terminal text (Python3)"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-3-Clause"
+homepage="https://github.com/tartley/colorama"
+distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
+checksum=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 9e6de67d12340ae2c9467a7d21903baef72e2196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:03:51 +0700
Subject: [PATCH 071/109] python-codespell: drop package

---
 srcpkgs/python-codespell/template  | 29 -----------------------------
 srcpkgs/python3-codespell          |  1 -
 srcpkgs/python3-codespell/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-codespell/template
 delete mode 120000 srcpkgs/python3-codespell
 create mode 100644 srcpkgs/python3-codespell/template

diff --git a/srcpkgs/python-codespell/template b/srcpkgs/python-codespell/template
deleted file mode 100644
index 9ae2e19435c..00000000000
--- a/srcpkgs/python-codespell/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-codespell'
-pkgname=python-codespell
-version=1.16.0
-revision=2
-archs=noarch
-wrksrc="codespell-${version}"
-build_style=python-module
-pycompile_module="codespell_lib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Checks code for common spelling mistakes (Python2)"
-maintainer="Nathan <ndowens04@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/codespell-project/codespell"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=53d22aefa1daf3365ca4625877271d23d143c0a92c16e55daf5cd14b6494b8f4
-alternatives="python-codespell:codespell:/usr/bin/codespell2"
-
-python3-codespell_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	pycompile_module="codespell_lib"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="python-codespell:codespell:/usr/bin/codespell3"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vmove usr/bin/codespell3
-	}
-}
diff --git a/srcpkgs/python3-codespell b/srcpkgs/python3-codespell
deleted file mode 120000
index 2784e18e19a..00000000000
--- a/srcpkgs/python3-codespell
+++ /dev/null
@@ -1 +0,0 @@
-python-codespell
\ No newline at end of file
diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template
new file mode 100644
index 00000000000..04e342d5e5c
--- /dev/null
+++ b/srcpkgs/python3-codespell/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-codespell'
+pkgname=python3-codespell
+version=1.16.0
+revision=3
+wrksrc="codespell-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Checks code for common spelling mistakes (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/codespell-project/codespell"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=53d22aefa1daf3365ca4625877271d23d143c0a92c16e55daf5cd14b6494b8f4
+conflicts="python-codespell>=0"

From 326e186502920ad4864a1f67efa747909c70d0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:04:18 +0700
Subject: [PATCH 072/109] python-click-log: drop package

---
 srcpkgs/python-click-log/template  | 31 ------------------------------
 srcpkgs/python3-click-log          |  1 -
 srcpkgs/python3-click-log/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-click-log/template
 delete mode 120000 srcpkgs/python3-click-log
 create mode 100644 srcpkgs/python3-click-log/template

diff --git a/srcpkgs/python-click-log/template b/srcpkgs/python-click-log/template
deleted file mode 100644
index b57a7a74b4a..00000000000
--- a/srcpkgs/python-click-log/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-click-log'
-pkgname=python-click-log
-version=0.3.2
-revision=2
-archs=noarch
-wrksrc="click-log-${version}"
-build_style="python-module"
-pycompile_module="click_log"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-click"
-short_desc="Logging integration for Click (Python2)"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="MIT"
-homepage="https://github.com/click-contrib/click-log"
-distfiles="${PYPI_SITE}/c/click-log/click-log-${version}.tar.gz"
-checksum=16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-click-log_package() {
-	archs=noarch
-	pycompile_module="click_log"
-	depends="python3-click"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-click-log b/srcpkgs/python3-click-log
deleted file mode 120000
index b6430133f92..00000000000
--- a/srcpkgs/python3-click-log
+++ /dev/null
@@ -1 +0,0 @@
-python-click-log
\ No newline at end of file
diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template
new file mode 100644
index 00000000000..340f9b17397
--- /dev/null
+++ b/srcpkgs/python3-click-log/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click-log'
+pkgname=python3-click-log
+version=0.3.2
+revision=3
+wrksrc="click-log-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3-click"
+short_desc="Logging integration for Click (Python3)"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="MIT"
+homepage="https://github.com/click-contrib/click-log"
+distfiles="${PYPI_SITE}/c/click-log/click-log-${version}.tar.gz"
+checksum=16fd1ca3fc6b16c98cea63acf1ab474ea8e676849dc669d86afafb0ed7003124
+
+post_install() {
+	vlicense LICENSE
+}

From b65340d2e70f18cb95e71623e98cd08c7afdcb2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:04:47 +0700
Subject: [PATCH 073/109] python-cliapp: drop package

---
 srcpkgs/python-cliapp/template | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 srcpkgs/python-cliapp/template

diff --git a/srcpkgs/python-cliapp/template b/srcpkgs/python-cliapp/template
deleted file mode 100644
index fd2c8cc4d13..00000000000
--- a/srcpkgs/python-cliapp/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-cliapp'
-pkgname=python-cliapp
-version=1.20180121
-revision=1
-archs=noarch
-build_style=python2-module
-pycompile_module="cliapp"
-hostmakedepends="python-setuptools python-yaml"
-depends="python-yaml"
-short_desc="Framework for Unix-like command line programs for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://liw.fi/cliapp/"
-license="GPL-2"
-distfiles="http://code.liw.fi/debian/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.xz"
-checksum=e00d8d16198c5f02a995f05ce11cb3a60f9f6ec37c55332f0d9294dd4fa71006

From 530ff51223cafbe84e3988a47e9d894ac573621e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:07:27 +0700
Subject: [PATCH 074/109] python-chroot: drop package

---
 srcpkgs/python-chroot/template  | 34 ---------------------------------
 srcpkgs/python3-chroot          |  1 -
 srcpkgs/python3-chroot/template | 20 +++++++++++++++++++
 3 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/python-chroot/template
 delete mode 120000 srcpkgs/python3-chroot
 create mode 100644 srcpkgs/python3-chroot/template

diff --git a/srcpkgs/python-chroot/template b/srcpkgs/python-chroot/template
deleted file mode 100644
index 7faa0f4cce9..00000000000
--- a/srcpkgs/python-chroot/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-chroot'
-pkgname=python-chroot
-version=0.9.18
-revision=2
-archs=noarch
-wrksrc="pychroot-${version}"
-build_style=python-module
-pycompile_module="pychroot"
-hostmakedepends="python-setuptools python3-setuptools python-snakeoil python3-snakeoil"
-depends="python-snakeoil"
-short_desc="Python2 Library and CLI tool that simplify chroot handling"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD"
-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
-alternatives="chroot:pychroot:/usr/bin/pychroot2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-chroot_package() {
-	archs=noarch
-	depends="python3-snakeoil"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="chroot:pychroot:/usr/bin/pychroot3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmove usr/bin/pychroot3
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-chroot b/srcpkgs/python3-chroot
deleted file mode 120000
index f9c14f8f07b..00000000000
--- a/srcpkgs/python3-chroot
+++ /dev/null
@@ -1 +0,0 @@
-python-chroot
\ No newline at end of file
diff --git a/srcpkgs/python3-chroot/template b/srcpkgs/python3-chroot/template
new file mode 100644
index 00000000000..ff679c914cf
--- /dev/null
+++ b/srcpkgs/python3-chroot/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-chroot'
+pkgname=python3-chroot
+version=0.9.18
+revision=3
+wrksrc="pychroot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-snakeoil"
+depends="python3-snakeoil"
+short_desc="Python3 Library and CLI tool that simplify chroot handling"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+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
+conflicts="python-chroot>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 8a8d51c489f309173e71ce4874bff53e50ca5d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:09:08 +0700
Subject: [PATCH 075/109] python-cached-property: drop package

---
 srcpkgs/python-cached-property/template  | 31 ------------------------
 srcpkgs/python3-cached-property          |  1 -
 srcpkgs/python3-cached-property/template | 18 ++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-cached-property/template
 delete mode 120000 srcpkgs/python3-cached-property
 create mode 100644 srcpkgs/python3-cached-property/template

diff --git a/srcpkgs/python-cached-property/template b/srcpkgs/python-cached-property/template
deleted file mode 100644
index 16c89346565..00000000000
--- a/srcpkgs/python-cached-property/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-cached-property'
-pkgname=python-cached-property
-version=1.5.1
-revision=2
-archs=noarch
-wrksrc="cached-property-${version}"
-build_style=python-module
-pycompile_module="cached_property.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Decorator for caching properties in classes (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pydanny/cached-property"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/c/cached-property/cached-property-${version}.tar.gz"
-checksum=9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-cached-property_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="cached_property.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-cached-property b/srcpkgs/python3-cached-property
deleted file mode 120000
index e3c4d2f4914..00000000000
--- a/srcpkgs/python3-cached-property
+++ /dev/null
@@ -1 +0,0 @@
-python-cached-property
\ No newline at end of file
diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template
new file mode 100644
index 00000000000..ddb395595cf
--- /dev/null
+++ b/srcpkgs/python3-cached-property/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-cached-property'
+pkgname=python3-cached-property
+version=1.5.1
+revision=3
+wrksrc="cached-property-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Decorator for caching properties in classes (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/pydanny/cached-property"
+distfiles="${PYPI_SITE}/c/cached-property/cached-property-${version}.tar.gz"
+checksum=9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504
+
+post_install() {
+	vlicense LICENSE
+}

From 81e209a8ad7e6abef7fd92c4e7107feeb8d90924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:09:30 +0700
Subject: [PATCH 076/109] python-bottle: drop package

---
 srcpkgs/python3-bottle                        |  1 -
 .../template                                  | 24 +++++--------------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-bottle
 rename srcpkgs/{python-bottle => python3-bottle}/template (50%)

diff --git a/srcpkgs/python3-bottle b/srcpkgs/python3-bottle
deleted file mode 120000
index 7124ef22d99..00000000000
--- a/srcpkgs/python3-bottle
+++ /dev/null
@@ -1 +0,0 @@
-python-bottle
\ No newline at end of file
diff --git a/srcpkgs/python-bottle/template b/srcpkgs/python3-bottle/template
similarity index 50%
rename from srcpkgs/python-bottle/template
rename to srcpkgs/python3-bottle/template
index 0ffc8adfec7..bf3d043c880 100644
--- a/srcpkgs/python-bottle/template
+++ b/srcpkgs/python3-bottle/template
@@ -1,13 +1,11 @@
-# Template file for 'python-bottle'
-pkgname=python-bottle
+# Template file for 'python3-bottle'
+pkgname=python3-bottle
 version=0.12.17
-revision=2
-archs=noarch
+revision=3
 wrksrc="bottle-${version}"
-build_style=python-module
-pycompile_module="bottle"
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Fast and simple WSGI-framework for small web-applications (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Fast and simple WSGI-framework for small web-applications (Python3)"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"
 homepage="http://bottlepy.org"
@@ -17,13 +15,3 @@ checksum=e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c
 post_install() {
 	vlicense LICENSE
 }
-
-python3-bottle_package() {
-	archs=noarch
-	pycompile_module="bottle"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense LICENSE
-	}
-}

From 6532de2e63a2ca5537cb5388925b3c633c38a1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:10:08 +0700
Subject: [PATCH 077/109] python-blinker: drop package

---
 srcpkgs/python-blinker/template  | 32 --------------------------------
 srcpkgs/python3-blinker          |  1 -
 srcpkgs/python3-blinker/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-blinker/template
 delete mode 120000 srcpkgs/python3-blinker
 create mode 100644 srcpkgs/python3-blinker/template

diff --git a/srcpkgs/python-blinker/template b/srcpkgs/python-blinker/template
deleted file mode 100644
index b6d1d63d19a..00000000000
--- a/srcpkgs/python-blinker/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-blinker'
-pkgname=python-blinker
-version=1.4
-revision=4
-archs=noarch
-wrksrc="blinker-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-pycompile_module="blinker"
-short_desc="Fast, simple object-to-object and broadcast signaling for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://pythonhosted.org/blinker/"
-license="MIT"
-distfiles="${PYPI_SITE}/b/blinker/blinker-${version}.tar.gz"
-checksum=471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-blinker_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="blinker"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-blinker b/srcpkgs/python3-blinker
deleted file mode 120000
index 221ddd65a4f..00000000000
--- a/srcpkgs/python3-blinker
+++ /dev/null
@@ -1 +0,0 @@
-python-blinker
\ No newline at end of file
diff --git a/srcpkgs/python3-blinker/template b/srcpkgs/python3-blinker/template
new file mode 100644
index 00000000000..4639d5c8d8b
--- /dev/null
+++ b/srcpkgs/python3-blinker/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-blinker'
+pkgname=python3-blinker
+version=1.4
+revision=5
+wrksrc="blinker-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Fast, simple object-to-object and broadcast signaling for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="http://pythonhosted.org/blinker/"
+distfiles="${PYPI_SITE}/b/blinker/blinker-${version}.tar.gz"
+checksum=471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6
+
+post_install() {
+	vlicense LICENSE
+}

From b69528d4db4666dea5d4ecfb861293ff3f6b3f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:10:36 +0700
Subject: [PATCH 078/109] python-blessings: drop package

---
 srcpkgs/python-blessings/template  | 31 ------------------------------
 srcpkgs/python3-blessings          |  1 -
 srcpkgs/python3-blessings/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-blessings/template
 delete mode 120000 srcpkgs/python3-blessings
 create mode 100644 srcpkgs/python3-blessings/template

diff --git a/srcpkgs/python-blessings/template b/srcpkgs/python-blessings/template
deleted file mode 100644
index baa4938c328..00000000000
--- a/srcpkgs/python-blessings/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-blessings'
-pkgname=python-blessings
-version=1.7
-revision=2
-archs=noarch
-wrksrc="blessings-${version}"
-build_style=python-module
-pycompile_module="blessings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="Wrapper around terminal coloring, styling, and positioning (Python2)"
-maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
-homepage="https://github.com/erikrose/blessings"
-license="MIT"
-distfiles="${PYPI_SITE}/b/blessings/blessings-${version}.tar.gz"
-checksum=98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-blessings_package() {
-	archs=noarch
-	depends="python3-six"
-	pycompile_module="blessings"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-blessings b/srcpkgs/python3-blessings
deleted file mode 120000
index bf277e1bbbc..00000000000
--- a/srcpkgs/python3-blessings
+++ /dev/null
@@ -1 +0,0 @@
-python-blessings
\ No newline at end of file
diff --git a/srcpkgs/python3-blessings/template b/srcpkgs/python3-blessings/template
new file mode 100644
index 00000000000..914f8922590
--- /dev/null
+++ b/srcpkgs/python3-blessings/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-blessings'
+pkgname=python3-blessings
+version=1.7
+revision=3
+wrksrc="blessings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Wrapper around terminal coloring, styling, and positioning (Python3)"
+maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
+license="MIT"
+homepage="https://github.com/erikrose/blessings"
+distfiles="${PYPI_SITE}/b/blessings/blessings-${version}.tar.gz"
+checksum=98e5854d805f50a5b58ac2333411b0482516a8210f23f43308baeb58d77c157d
+
+post_install() {
+	vlicense LICENSE
+}

From 16175d1a55dd1e9ecab5ce5f808eb51834f73285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:11:10 +0700
Subject: [PATCH 079/109] python-backports_abc: drop package

---
 srcpkgs/python-backports_abc/template | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-backports_abc/template

diff --git a/srcpkgs/python-backports_abc/template b/srcpkgs/python-backports_abc/template
deleted file mode 100644
index 9d2e5565f02..00000000000
--- a/srcpkgs/python-backports_abc/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-backports_abc'
-pkgname=python-backports_abc
-version=0.5
-revision=1
-archs=noarch
-wrksrc="backports_abc-${version}"
-build_style=python2-module
-pycompile_module="backports_abc.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of collections.abc from Python 3.5"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/cython/backports_abc"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports_abc/backports_abc-${version}.tar.gz"
-checksum=033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde
-
-post_install() {
-	vlicense LICENSE
-}

From c142c946137eccc695ea7fb4c621bb17725123e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:11:28 +0700
Subject: [PATCH 080/109] python-backports.ssl_match_hostname: drop package

---
 .../template                                  | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 srcpkgs/python-backports.ssl_match_hostname/template

diff --git a/srcpkgs/python-backports.ssl_match_hostname/template b/srcpkgs/python-backports.ssl_match_hostname/template
deleted file mode 100644
index dd4d76b47db..00000000000
--- a/srcpkgs/python-backports.ssl_match_hostname/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-backports.ssl_match_hostname'
-pkgname=python-backports.ssl_match_hostname
-version=3.5.0.1
-revision=3
-archs=noarch
-wrksrc="backports.ssl_match_hostname-${version}"
-build_style=python2-module
-pycompile_module="backports"
-hostmakedepends="python"
-depends="python-backports"
-short_desc="The ssl.match_hostname() function from Python 3.5"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://bitbucket.org/brandon/backports.ssl_match_hostname"
-license="PSF"
-distfiles="${PYPI_SITE}/b/backports.ssl_match_hostname/backports.ssl_match_hostname-${version}.tar.gz"
-checksum=502ad98707319f4a51fa2ca1c677bd659008d27ded9f6380c79e8932e38dcdf2
-
-post_install() {
-	# namespace provided by python-backports package
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}

From 19ad3139c611022ac364b1230b30cd6c2e43562d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:11:36 +0700
Subject: [PATCH 081/109] python-backports.shutil_get_terminal_size: drop
 package

---
 .../template                                  | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 srcpkgs/python-backports.shutil_get_terminal_size/template

diff --git a/srcpkgs/python-backports.shutil_get_terminal_size/template b/srcpkgs/python-backports.shutil_get_terminal_size/template
deleted file mode 100644
index 2e9a5af7f52..00000000000
--- a/srcpkgs/python-backports.shutil_get_terminal_size/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-backports.shutil_get_terminal_size'
-pkgname=python-backports.shutil_get_terminal_size
-version=1.0.0
-revision=1
-archs=noarch
-wrksrc="backports.shutil_get_terminal_size-${version}"
-build_style=python2-module
-pycompile_module="backports"
-hostmakedepends="python-setuptools"
-depends="python-backports"
-short_desc="Backport of the get_terminal_size function from Python 3.3's shutil"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/chrippa/backports.shutil_get_terminal_size"
-license="MIT"
-distfiles="${PYPI_SITE}/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-${version}.tar.gz"
-checksum=713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80
-
-post_install() {
-	# namespace provided by python-backports package
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/backports/__init__.py
-}

From 70829e17cef679b78c3d6f0a768358ca74757f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:12:01 +0700
Subject: [PATCH 082/109] python-Arrow: drop package

---
 srcpkgs/python-Arrow/template  | 24 ------------------------
 srcpkgs/python3-Arrow          |  1 -
 srcpkgs/python3-Arrow/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/python-Arrow/template
 delete mode 120000 srcpkgs/python3-Arrow
 create mode 100644 srcpkgs/python3-Arrow/template

diff --git a/srcpkgs/python-Arrow/template b/srcpkgs/python-Arrow/template
deleted file mode 100644
index a8c2e30c74b..00000000000
--- a/srcpkgs/python-Arrow/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-Arrow'
-pkgname=python-Arrow
-version=0.15.5
-revision=1
-archs=noarch
-wrksrc="arrow-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-dateutil python-backports.functools_lru_cache"
-short_desc="Better dates & times for Python (Python2)"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/crsmithdev/arrow"
-distfiles="${PYPI_SITE}/a/arrow/arrow-${version}.tar.gz"
-checksum=5390e464e2c5f76971b60ffa7ee29c598c7501a294bc9f5e6dadcb251a5d027b
-
-python3-Arrow_package() {
-	archs=noarch
-	depends="python3-dateutil"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-Arrow b/srcpkgs/python3-Arrow
deleted file mode 120000
index a4d5b422e3f..00000000000
--- a/srcpkgs/python3-Arrow
+++ /dev/null
@@ -1 +0,0 @@
-python-Arrow
\ No newline at end of file
diff --git a/srcpkgs/python3-Arrow/template b/srcpkgs/python3-Arrow/template
new file mode 100644
index 00000000000..a03ac3fd2a6
--- /dev/null
+++ b/srcpkgs/python3-Arrow/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-Arrow'
+pkgname=python3-Arrow
+version=0.15.5
+revision=2
+wrksrc="arrow-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-dateutil"
+short_desc="Better dates & times for Python (Python3)"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/crsmithdev/arrow"
+distfiles="${PYPI_SITE}/a/arrow/arrow-${version}.tar.gz"
+checksum=5390e464e2c5f76971b60ffa7ee29c598c7501a294bc9f5e6dadcb251a5d027b

From 608d2810a195f82baabfcc8655fab0541d7c174c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:13:00 +0700
Subject: [PATCH 083/109] python-backcall: drop package

---
 srcpkgs/python-backcall/template  | 26 --------------------------
 srcpkgs/python3-backcall          |  1 -
 srcpkgs/python3-backcall/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-backcall/template
 delete mode 120000 srcpkgs/python3-backcall
 create mode 100644 srcpkgs/python3-backcall/template

diff --git a/srcpkgs/python-backcall/template b/srcpkgs/python-backcall/template
deleted file mode 100644
index a55af727ab6..00000000000
--- a/srcpkgs/python-backcall/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-backcall'
-pkgname=python-backcall
-version=0.1.0
-revision=2
-archs=noarch
-wrksrc="backcall-${version}"
-build_style=python-module
-pycompile_module="backcall"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 module to write backwards compatible callback APIs"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/takluyver/backcall"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/b/backcall/backcall-${version}.tar.gz"
-checksum=38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4
-
-python3-backcall_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="backcall"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-backcall b/srcpkgs/python3-backcall
deleted file mode 120000
index 011083fc736..00000000000
--- a/srcpkgs/python3-backcall
+++ /dev/null
@@ -1 +0,0 @@
-python-backcall
\ No newline at end of file
diff --git a/srcpkgs/python3-backcall/template b/srcpkgs/python3-backcall/template
new file mode 100644
index 00000000000..4cfb47a897d
--- /dev/null
+++ b/srcpkgs/python3-backcall/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-backcall'
+pkgname=python3-backcall
+version=0.1.0
+revision=3
+wrksrc="backcall-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 module to write backwards compatible callback APIs"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/takluyver/backcall"
+distfiles="${PYPI_SITE}/b/backcall/backcall-${version}.tar.gz"
+checksum=38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4

From 3d394eebe963a6b762994a8e5e4968e6b75d24ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:16:43 +0700
Subject: [PATCH 084/109] python3-backcall: update to 0.2.0.

---
 srcpkgs/python3-backcall/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-backcall/template b/srcpkgs/python3-backcall/template
index 4cfb47a897d..b08e321c8eb 100644
--- a/srcpkgs/python3-backcall/template
+++ b/srcpkgs/python3-backcall/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-backcall'
 pkgname=python3-backcall
-version=0.1.0
+version=0.2.0
 revision=3
 wrksrc="backcall-${version}"
 build_style=python3-module
@@ -11,4 +11,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/takluyver/backcall"
 distfiles="${PYPI_SITE}/b/backcall/backcall-${version}.tar.gz"
-checksum=38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4
+checksum=5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e
+
+post_install() {
+	vlicense LICENSE
+}

From 569e5e9466ccca44c48374ced78eb44866057abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:17:29 +0700
Subject: [PATCH 085/109] python-babelfish: drop package

---
 srcpkgs/python-babelfish/template  | 30 ------------------------------
 srcpkgs/python3-babelfish          |  1 -
 srcpkgs/python3-babelfish/template | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-babelfish/template
 delete mode 120000 srcpkgs/python3-babelfish
 create mode 100644 srcpkgs/python3-babelfish/template

diff --git a/srcpkgs/python-babelfish/template b/srcpkgs/python-babelfish/template
deleted file mode 100644
index 47d5bb176cc..00000000000
--- a/srcpkgs/python-babelfish/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-babelfish'
-pkgname=python-babelfish
-version=0.5.5
-revision=2
-archs=noarch
-wrksrc="babelfish-${version}"
-build_style=python-module
-pycompile_module="babelfish"
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="A module to work with countries and languages (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="BSD-3-Clause"
-homepage="https://github.com/Diaoul/babelfish"
-distfiles="${PYPI_SITE}/b/babelfish/babelfish-${version}.tar.gz"
-checksum=8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-babelfish_package() {
-	archs=noarch
-	pycompile_module="babelfish"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-babelfish b/srcpkgs/python3-babelfish
deleted file mode 120000
index eae373b49f6..00000000000
--- a/srcpkgs/python3-babelfish
+++ /dev/null
@@ -1 +0,0 @@
-python-babelfish
\ No newline at end of file
diff --git a/srcpkgs/python3-babelfish/template b/srcpkgs/python3-babelfish/template
new file mode 100644
index 00000000000..57dedc929f0
--- /dev/null
+++ b/srcpkgs/python3-babelfish/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-babelfish'
+pkgname=python3-babelfish
+version=0.5.5
+revision=3
+wrksrc="babelfish-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Module to work with countries and languages (Python3)"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="BSD-3-Clause"
+homepage="https://github.com/Diaoul/babelfish"
+distfiles="${PYPI_SITE}/b/babelfish/babelfish-${version}.tar.gz"
+checksum=8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104
+
+post_install() {
+	vlicense LICENSE
+}

From f86c8f703eb6f1f7729e9cddea1e849bae2f3810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:24:00 +0700
Subject: [PATCH 086/109] backblaze-b2: drop noarch

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

diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template
index ef7fbca68b6..d1a8cda6f05 100644
--- a/srcpkgs/backblaze-b2/template
+++ b/srcpkgs/backblaze-b2/template
@@ -1,8 +1,7 @@
 # Template file for 'backblaze-b2'
 pkgname=backblaze-b2
 version=1.4.2
-revision=3
-archs=noarch
+revision=4
 wrksrc="b2-${version}"
 build_style=python3-module
 pycompile_module="b2"
@@ -43,6 +42,5 @@ do_check() {
 python-b2_package() {
 	depends="backblaze-b2>=${version}_${revision}"
 	build_style=meta
-	archs=noarch
 	short_desc+=" - transitional package"
 }

From 7fa54635664bb199d5326cb52a57bf75ead66770 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 15 Sep 2020 16:59:03 +1000
Subject: [PATCH 087/109] python-b2sdk: remove noarch.

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

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 8c51c62d603..a499face476 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -2,11 +2,9 @@
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
 version=1.1.4
-revision=1
-archs=noarch
+revision=2
 wrksrc="b2sdk-${version}"
 build_style=python3-module
-pycompile_module="b2sdk"
 hostmakedepends="python3-setuptools"
 depends="python3-logfury python3-Arrow python3-requests python3-six"
 checkdepends="python3-pytest $depends python3-dateutil python3-nose

From 95f5da80d6bc06a1eabdc1b5305f0846a5629813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:27:54 +0700
Subject: [PATCH 088/109] python-pylastfp: drop package

---
 srcpkgs/python-pylastfp/template | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 srcpkgs/python-pylastfp/template

diff --git a/srcpkgs/python-pylastfp/template b/srcpkgs/python-pylastfp/template
deleted file mode 100644
index 6300e7c7ce4..00000000000
--- a/srcpkgs/python-pylastfp/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-pylastfp'
-pkgname=python-pylastfp
-version=0.6
-revision=4
-wrksrc="pylastfp-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel libsamplerate-devel fftw-devel"
-depends="python-audioread"
-pycompile_module="lastfp"
-short_desc="Python bindings for Last.fm's acoustic fingerprinting (fplib)"
-maintainer="Steven R <dev@styez.com>"
-homepage="https://github.com/sampsyo/pylastfp"
-license="LGPL-3"
-distfiles="${PYPI_SITE}/p/pylastfp/pylastfp-${version}.tar.gz"
-checksum="5f9a32e532ab62e5663298b4b3b1db86f5466404f111ccaa9030c23ffee140f7"
-
-pre_build() {
-	mv lastmatch{.py,}
-	sed -i 's,lastmatch.py,lastmatch,g' lastmatch setup.py
-}

From 0fe2d770edaed21f4c7ed672dc5e99241868a723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:28:07 +0700
Subject: [PATCH 089/109] python-audioread: drop package

---
 srcpkgs/python-audioread/INSTALL.msg          |  4 ---
 srcpkgs/python3-audioread                     |  1 -
 .../INSTALL.msg}                              |  0
 .../template                                  | 27 +++++--------------
 4 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/python-audioread/INSTALL.msg
 delete mode 120000 srcpkgs/python3-audioread
 rename srcpkgs/{python-audioread/python3-audioread.INSTALL.msg => python3-audioread/INSTALL.msg} (100%)
 rename srcpkgs/{python-audioread => python3-audioread}/template (50%)

diff --git a/srcpkgs/python-audioread/INSTALL.msg b/srcpkgs/python-audioread/INSTALL.msg
deleted file mode 100644
index 895bea34926..00000000000
--- a/srcpkgs/python-audioread/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-To decode audio files the library supports different backends:
-- gstreamer via gst1-python
-- ffmpeg via its command-line interface
-- wave, aifc, and sunau files via Python standard library
diff --git a/srcpkgs/python3-audioread b/srcpkgs/python3-audioread
deleted file mode 120000
index 8983e80d1b1..00000000000
--- a/srcpkgs/python3-audioread
+++ /dev/null
@@ -1 +0,0 @@
-python-audioread
\ No newline at end of file
diff --git a/srcpkgs/python-audioread/python3-audioread.INSTALL.msg b/srcpkgs/python3-audioread/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-audioread/python3-audioread.INSTALL.msg
rename to srcpkgs/python3-audioread/INSTALL.msg
diff --git a/srcpkgs/python-audioread/template b/srcpkgs/python3-audioread/template
similarity index 50%
rename from srcpkgs/python-audioread/template
rename to srcpkgs/python3-audioread/template
index bc878d4b82d..41ff43ccf4a 100644
--- a/srcpkgs/python-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,14 +1,12 @@
-# Template file for 'python-audioread'
-pkgname=python-audioread
+# Template file for 'python3-audioread'
+pkgname=python3-audioread
 version=2.1.8
-revision=2
-archs=noarch
+revision=3
 wrksrc="audioread-${version}"
-build_style=python-module
-pycompile_module="audioread"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Multi-library, cross-platform audio decoding (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Multi-library, cross-platform audio decoding (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/sampsyo/audioread/"
@@ -19,14 +17,3 @@ post_install() {
 	sed -n '2,13p' decode.py > LICENSE
 	vlicense LICENSE
 }
-
-python3-audioread_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="audioread"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}

From 6e60a1217db6a9d9695f5de334848035db1df4c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:28:28 +0700
Subject: [PATCH 090/109] python-atspi: drop package

---
 srcpkgs/python-atspi/template | 17 -----------------
 srcpkgs/python-atspi/update   |  1 -
 2 files changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-atspi/template
 delete mode 100644 srcpkgs/python-atspi/update

diff --git a/srcpkgs/python-atspi/template b/srcpkgs/python-atspi/template
deleted file mode 100644
index 7505c32ad60..00000000000
--- a/srcpkgs/python-atspi/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-atspi'
-# Keep python3-atspi in sync
-pkgname=python-atspi
-version=2.38.0
-revision=1
-archs=noarch
-wrksrc="pyatspi-${version}"
-build_style=gnu-configure
-hostmakedepends="pkg-config python"
-makedepends="at-spi2-core-devel python-gobject-devel"
-depends="at-spi2-core python-gobject"
-short_desc="Python2 bindings for AT-SPI"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://gitlab.gnome.org/GNOME/pyatspi2"
-distfiles="${GNOME_SITE}/pyatspi/${version%.*}/pyatspi-${version}.tar.xz"
-checksum=ff809312fd0c2f61e191c181a1a638a30b579b91b682cfb5a05535a55265b43d
diff --git a/srcpkgs/python-atspi/update b/srcpkgs/python-atspi/update
deleted file mode 100644
index a2771db6a34..00000000000
--- a/srcpkgs/python-atspi/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyatspi

From 464324f3cb533d6502359aef6bd4f658b77a9ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:29:14 +0700
Subject: [PATCH 091/109] python-asn1crypto: drop package

---
 srcpkgs/python-asn1crypto/template  | 31 -----------------------------
 srcpkgs/python3-asn1crypto          |  1 -
 srcpkgs/python3-asn1crypto/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-asn1crypto/template
 delete mode 120000 srcpkgs/python3-asn1crypto
 create mode 100644 srcpkgs/python3-asn1crypto/template

diff --git a/srcpkgs/python-asn1crypto/template b/srcpkgs/python-asn1crypto/template
deleted file mode 100644
index e7ffe7415fc..00000000000
--- a/srcpkgs/python-asn1crypto/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-asn1crypto'
-pkgname=python-asn1crypto
-version=0.24.0
-revision=2
-archs=noarch
-wrksrc="asn1crypto-${version}"
-build_style=python-module
-pycompile_module="asn1crypto"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 ASN.1 library with a focus on performance and a pythonic API"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/wbond/asn1crypto"
-license="MIT"
-distfiles="${PYPI_SITE}/a/asn1crypto/asn1crypto-${version}.tar.gz"
-checksum=9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-asn1crypto_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="asn1crypto"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-asn1crypto b/srcpkgs/python3-asn1crypto
deleted file mode 120000
index dd2d73e2a49..00000000000
--- a/srcpkgs/python3-asn1crypto
+++ /dev/null
@@ -1 +0,0 @@
-python-asn1crypto
\ No newline at end of file
diff --git a/srcpkgs/python3-asn1crypto/template b/srcpkgs/python3-asn1crypto/template
new file mode 100644
index 00000000000..d930b7b43ee
--- /dev/null
+++ b/srcpkgs/python3-asn1crypto/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-asn1crypto'
+pkgname=python3-asn1crypto
+version=0.24.0
+revision=3
+wrksrc="asn1crypto-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 ASN.1 library with a focus on performance and a pythonic API"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/wbond/asn1crypto"
+distfiles="${PYPI_SITE}/a/asn1crypto/asn1crypto-${version}.tar.gz"
+checksum=9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49
+
+post_install() {
+	vlicense LICENSE
+}

From 230ea1b9e500e9ef17cb0c5434b07fff32e30ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:29:40 +0700
Subject: [PATCH 092/109] python-arxiv2bib: drop package

---
 srcpkgs/python-arxiv2bib/template  | 35 ------------------------------
 srcpkgs/python3-arxiv2bib          |  1 -
 srcpkgs/python3-arxiv2bib/template | 20 +++++++++++++++++
 3 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/python-arxiv2bib/template
 delete mode 120000 srcpkgs/python3-arxiv2bib
 create mode 100644 srcpkgs/python3-arxiv2bib/template

diff --git a/srcpkgs/python-arxiv2bib/template b/srcpkgs/python-arxiv2bib/template
deleted file mode 100644
index 4f245755dcf..00000000000
--- a/srcpkgs/python-arxiv2bib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-arxiv2bib'
-pkgname=python-arxiv2bib
-version=1.0.8
-revision=3
-archs=noarch
-wrksrc="arxiv2bib-${version}"
-build_style=python-module
-pycompile_module="arxiv2bib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 package for getting arXiv data in BibTeX"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="http://nathangrigg.github.io/arxiv2bib"
-distfiles="${PYPI_SITE}/a/arxiv2bib/arxiv2bib-${version}.tar.gz"
-checksum=137608ed8aa4da6594350152964b9b0f46c6efcb07f8a4dfd50309c968b647a8
-alternatives="arxiv2bib:arxiv2bib:/usr/bin/arxiv2bib2"
-
-post_install() {
-	sed -n '3,28p' arxiv2bib.py > LICENSE
-	vlicense LICENSE
-}
-
-python3-arxiv2bib_package() {
-	archs=noarch
-	pycompile_module="arxiv2bib.py"
-	alternatives="arxiv2bib:arxiv2bib:/usr/bin/arxiv2bib3"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmove usr/bin/*3
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-arxiv2bib b/srcpkgs/python3-arxiv2bib
deleted file mode 120000
index 6dea3caf912..00000000000
--- a/srcpkgs/python3-arxiv2bib
+++ /dev/null
@@ -1 +0,0 @@
-python-arxiv2bib
\ No newline at end of file
diff --git a/srcpkgs/python3-arxiv2bib/template b/srcpkgs/python3-arxiv2bib/template
new file mode 100644
index 00000000000..74d3cc90961
--- /dev/null
+++ b/srcpkgs/python3-arxiv2bib/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-arxiv2bib'
+pkgname=python3-arxiv2bib
+version=1.0.8
+revision=4
+wrksrc="arxiv2bib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Python3 package for getting arXiv data in BibTeX"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="http://nathangrigg.github.io/arxiv2bib"
+distfiles="${PYPI_SITE}/a/arxiv2bib/arxiv2bib-${version}.tar.gz"
+checksum=137608ed8aa4da6594350152964b9b0f46c6efcb07f8a4dfd50309c968b647a8
+conflicts="python-arxiv2bib>=0"
+
+post_install() {
+	sed -n '3,28p' arxiv2bib.py > LICENSE
+	vlicense LICENSE
+}

From acc3d11ff2a8c3eb5ec44b79552717a504908301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:30:53 +0700
Subject: [PATCH 093/109] python-argh: drop package

---
 srcpkgs/python-argh/template  | 26 --------------------------
 srcpkgs/python3-argh          |  1 -
 srcpkgs/python3-argh/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-argh/template
 delete mode 120000 srcpkgs/python3-argh
 create mode 100644 srcpkgs/python3-argh/template

diff --git a/srcpkgs/python-argh/template b/srcpkgs/python-argh/template
deleted file mode 100644
index 656da441757..00000000000
--- a/srcpkgs/python-argh/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-argh'
-pkgname=python-argh
-version=0.26.2
-revision=2
-archs=noarch
-wrksrc="argh-${version}"
-build_style=python-module
-pycompile_module="argh"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="An unobtrusive argparse wrapper with natural syntax (Python2)"
-maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
-homepage="http://github.com/neithere/argh/"
-license="LGPL-3"
-distfiles="${PYPI_SITE}/a/argh/argh-${version}.tar.gz"
-checksum=e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65
-
-python3-argh_package() {
-	archs=noarch
-	pycompile_module="argh"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-argh b/srcpkgs/python3-argh
deleted file mode 120000
index d67f34c56ad..00000000000
--- a/srcpkgs/python3-argh
+++ /dev/null
@@ -1 +0,0 @@
-python-argh
\ No newline at end of file
diff --git a/srcpkgs/python3-argh/template b/srcpkgs/python3-argh/template
new file mode 100644
index 00000000000..51d4e18343d
--- /dev/null
+++ b/srcpkgs/python3-argh/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-argh'
+pkgname=python3-argh
+version=0.26.2
+revision=3
+wrksrc="argh-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Unobtrusive argparse wrapper with natural syntax (Python3)"
+maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
+license="LGPL-3.0-only"
+homepage="http://github.com/neithere/argh/"
+distfiles="${PYPI_SITE}/a/argh/argh-${version}.tar.gz"
+checksum=e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65

From 743c2895d0f424c38231a8c529d570a155ae395e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:31:20 +0700
Subject: [PATCH 094/109] python-appdirs: drop package

---
 srcpkgs/python-appdirs/template  | 33 --------------------------------
 srcpkgs/python3-appdirs          |  1 -
 srcpkgs/python3-appdirs/template | 22 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-appdirs/template
 delete mode 120000 srcpkgs/python3-appdirs
 create mode 100644 srcpkgs/python3-appdirs/template

diff --git a/srcpkgs/python-appdirs/template b/srcpkgs/python-appdirs/template
deleted file mode 100644
index 68f8fa5cb4f..00000000000
--- a/srcpkgs/python-appdirs/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-appdirs'
-pkgname=python-appdirs
-version=1.4.4
-revision=1
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 module for determining appropriate platform-specific dirs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ActiveState/appdirs/"
-distfiles="${PYPI_SITE}/a/appdirs/appdirs-${version}.tar.gz"
-checksum=7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41
-
-do_check() {
-	python2 setup.py test
-}
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-appdirs_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-appdirs b/srcpkgs/python3-appdirs
deleted file mode 120000
index a759b105cdf..00000000000
--- a/srcpkgs/python3-appdirs
+++ /dev/null
@@ -1 +0,0 @@
-python-appdirs
\ No newline at end of file
diff --git a/srcpkgs/python3-appdirs/template b/srcpkgs/python3-appdirs/template
new file mode 100644
index 00000000000..20ba0a1dd26
--- /dev/null
+++ b/srcpkgs/python3-appdirs/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-appdirs'
+pkgname=python3-appdirs
+version=1.4.4
+revision=2
+wrksrc="appdirs-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 module for determining appropriate platform-specific dirs"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ActiveState/appdirs/"
+distfiles="${PYPI_SITE}/a/appdirs/appdirs-${version}.tar.gz"
+checksum=7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41
+
+do_check() {
+	python2 setup.py test
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 76ba3205105d64882772024facfac7b4a981e64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:31:42 +0700
Subject: [PATCH 095/109] python-ansicolor: drop package

---
 srcpkgs/python-ansicolor/template  | 26 --------------------------
 srcpkgs/python3-ansicolor          |  1 -
 srcpkgs/python3-ansicolor/template | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/python-ansicolor/template
 delete mode 120000 srcpkgs/python3-ansicolor
 create mode 100644 srcpkgs/python3-ansicolor/template

diff --git a/srcpkgs/python-ansicolor/template b/srcpkgs/python-ansicolor/template
deleted file mode 100644
index 3663a82f0cc..00000000000
--- a/srcpkgs/python-ansicolor/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-ansicolor'
-pkgname=python-ansicolor
-version=0.2.6
-revision=3
-archs=noarch
-wrksrc="ansicolor-${version}"
-build_style=python-module
-pycompile_module="ansicolor"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Library to produce ansi color output (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="Apache-2.0"
-homepage="https://github.com/numerodix/ansicolor"
-distfiles="${PYPI_SITE}/a/ansicolor/ansicolor-${version}.tar.gz"
-checksum=d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d
-
-python3-ansicolor_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="ansicolor"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-ansicolor b/srcpkgs/python3-ansicolor
deleted file mode 120000
index 9a095f0d4cf..00000000000
--- a/srcpkgs/python3-ansicolor
+++ /dev/null
@@ -1 +0,0 @@
-python-ansicolor
\ No newline at end of file
diff --git a/srcpkgs/python3-ansicolor/template b/srcpkgs/python3-ansicolor/template
new file mode 100644
index 00000000000..c60eea83303
--- /dev/null
+++ b/srcpkgs/python3-ansicolor/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ansicolor'
+pkgname=python3-ansicolor
+version=0.2.6
+revision=4
+wrksrc="ansicolor-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Library to produce ansi color output (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="Apache-2.0"
+homepage="https://github.com/numerodix/ansicolor"
+distfiles="${PYPI_SITE}/a/ansicolor/ansicolor-${version}.tar.gz"
+checksum=d17e1b07b9dd7ded31699fbca53ae6cd373584f9b6dcbc124d1f321ebad31f1d

From 079aaffc7ec066a28ddf4323972dcebd7a5d13c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:32:06 +0700
Subject: [PATCH 096/109] python-alabaster: drop package

---
 srcpkgs/python-alabaster/template  | 31 ------------------------------
 srcpkgs/python3-alabaster          |  1 -
 srcpkgs/python3-alabaster/template | 18 +++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-alabaster/template
 delete mode 120000 srcpkgs/python3-alabaster
 create mode 100644 srcpkgs/python3-alabaster/template

diff --git a/srcpkgs/python-alabaster/template b/srcpkgs/python-alabaster/template
deleted file mode 100644
index b33009d5efb..00000000000
--- a/srcpkgs/python-alabaster/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-alabaster'
-pkgname=python-alabaster
-version=0.7.12
-revision=2
-archs=noarch
-wrksrc="alabaster-${version}"
-build_style=python-module
-pycompile_module="alabaster"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Configurable sidebar-enabled Sphinx theme (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://alabaster.readthedocs.io/"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/a/alabaster/alabaster-${version}.tar.gz"
-checksum=a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-alabaster_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="alabaster"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-alabaster b/srcpkgs/python3-alabaster
deleted file mode 120000
index 8efee5973a1..00000000000
--- a/srcpkgs/python3-alabaster
+++ /dev/null
@@ -1 +0,0 @@
-python-alabaster
\ No newline at end of file
diff --git a/srcpkgs/python3-alabaster/template b/srcpkgs/python3-alabaster/template
new file mode 100644
index 00000000000..736913e821e
--- /dev/null
+++ b/srcpkgs/python3-alabaster/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-alabaster'
+pkgname=python3-alabaster
+version=0.7.12
+revision=3
+wrksrc="alabaster-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Configurable sidebar-enabled Sphinx theme (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://alabaster.readthedocs.io/"
+distfiles="${PYPI_SITE}/a/alabaster/alabaster-${version}.tar.gz"
+checksum=a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02
+
+post_install() {
+	vlicense LICENSE
+}

From b5c39cde70a1610e17dbd51f35f90165e5131ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:32:25 +0700
Subject: [PATCH 097/109] python-aalib: drop package

---
 srcpkgs/python-aalib/template  | 31 -------------------------------
 srcpkgs/python3-aalib          |  1 -
 srcpkgs/python3-aalib/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-aalib/template
 delete mode 120000 srcpkgs/python3-aalib
 create mode 100644 srcpkgs/python3-aalib/template

diff --git a/srcpkgs/python-aalib/template b/srcpkgs/python-aalib/template
deleted file mode 100644
index f9621a9c8dc..00000000000
--- a/srcpkgs/python-aalib/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-aalib'
-pkgname=python-aalib
-version=0.3.2
-revision=2
-build_style=python-module
-pycompile_module="aalib.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="aalib python"
-short_desc="Python2 interface to AAlib, an ASCII art library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://jwilk.net/software/python-aalib"
-distfiles="${PYPI_SITE}/p/python-aalib/python-aalib-${version}.tar.gz"
-checksum=c39071629e7962dcd926faf0135dc73e2a8eb5db9a53bc2ebe5965f8c39165a2
-archs=noarch
-
-post_install() {
-	sed -n '3,21p' < setup.py > LICENSE
-	vlicense LICENSE
-}
-
-python3-aalib_package() {
-	archs=noarch
-	pycompile_module="aalib.py"
-	depends="aalib python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-aalib b/srcpkgs/python3-aalib
deleted file mode 120000
index 854bacf6f64..00000000000
--- a/srcpkgs/python3-aalib
+++ /dev/null
@@ -1 +0,0 @@
-python-aalib
\ No newline at end of file
diff --git a/srcpkgs/python3-aalib/template b/srcpkgs/python3-aalib/template
new file mode 100644
index 00000000000..bc768738bc6
--- /dev/null
+++ b/srcpkgs/python3-aalib/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-aalib'
+pkgname=python3-aalib
+version=0.3.2
+revision=3
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="aalib python3"
+short_desc="Python3 interface to AAlib, an ASCII art library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="http://jwilk.net/software/python-aalib"
+distfiles="${PYPI_SITE}/p/python-aalib/python-aalib-${version}.tar.gz"
+checksum=c39071629e7962dcd926faf0135dc73e2a8eb5db9a53bc2ebe5965f8c39165a2
+
+post_install() {
+	sed -n '3,21p' < setup.py > LICENSE
+	vlicense LICENSE
+}

From 0f50d2bcd4ed82a61f7b27d2ce768842530dde41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:32:54 +0700
Subject: [PATCH 098/109] python-Yapsy: drop package

---
 srcpkgs/python-Yapsy/template  | 31 -------------------------------
 srcpkgs/python3-Yapsy          |  1 -
 srcpkgs/python3-Yapsy/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-Yapsy/template
 delete mode 120000 srcpkgs/python3-Yapsy
 create mode 100644 srcpkgs/python3-Yapsy/template

diff --git a/srcpkgs/python-Yapsy/template b/srcpkgs/python-Yapsy/template
deleted file mode 100644
index 5ad8b234f5d..00000000000
--- a/srcpkgs/python-Yapsy/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-Yapsy'
-pkgname=python-Yapsy
-version=1.12.2
-revision=2
-archs=noarch
-wrksrc="Yapsy-${version}"
-build_style=python-module
-pycompile_module="yapsy"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Yet another plugin system"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD-2-Clause"
-homepage="http://yapsy.sourceforge.net/"
-distfiles="${PYPI_SITE}/Y/Yapsy/Yapsy-${version}.tar.gz"
-checksum=d8113d9f9c74eacf65b4663c9c037d278c9cb273b5eee5f0e1803baeedb23f8b
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-Yapsy_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="yapsy"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-Yapsy b/srcpkgs/python3-Yapsy
deleted file mode 120000
index 4345c734003..00000000000
--- a/srcpkgs/python3-Yapsy
+++ /dev/null
@@ -1 +0,0 @@
-python-Yapsy
\ No newline at end of file
diff --git a/srcpkgs/python3-Yapsy/template b/srcpkgs/python3-Yapsy/template
new file mode 100644
index 00000000000..38b88be2a1a
--- /dev/null
+++ b/srcpkgs/python3-Yapsy/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Yapsy'
+pkgname=python3-Yapsy
+version=1.12.2
+revision=3
+wrksrc="Yapsy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Yet another plugin system"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="BSD-2-Clause"
+homepage="http://yapsy.sourceforge.net/"
+distfiles="${PYPI_SITE}/Y/Yapsy/Yapsy-${version}.tar.gz"
+checksum=d8113d9f9c74eacf65b4663c9c037d278c9cb273b5eee5f0e1803baeedb23f8b
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 6312406f75758d8b655e6c4805aff161d8dcd7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:33:25 +0700
Subject: [PATCH 099/109] python-Whoosh: drop package

---
 srcpkgs/python-Whoosh/template  | 32 --------------------------------
 srcpkgs/python3-Whoosh          |  1 -
 srcpkgs/python3-Whoosh/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-Whoosh/template
 delete mode 120000 srcpkgs/python3-Whoosh
 create mode 100644 srcpkgs/python3-Whoosh/template

diff --git a/srcpkgs/python-Whoosh/template b/srcpkgs/python-Whoosh/template
deleted file mode 100644
index 66856b206a7..00000000000
--- a/srcpkgs/python-Whoosh/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-whoosh'
-pkgname=python-Whoosh
-version=2.7.4
-revision=2
-wrksrc="Whoosh-${version}"
-archs=noarch
-build_style=python-module
-pycompile_module="whoosh"
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python"
-short_desc="Full-text indexing and searching library (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="BSD-2-Clause"
-homepage="https://bitbucket.org/mchaput/whoosh/wiki/Home"
-distfiles="${PYPI_SITE}/W/Whoosh/Whoosh-${version}.tar.gz"
-checksum=7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83
-
-post_install() {
-	vlicense LICENSE.txt LICENSE
-}
-
-python3-Whoosh_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	pycompile_module="whoosh"
-	archs=noarch
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Whoosh b/srcpkgs/python3-Whoosh
deleted file mode 120000
index 1d62914385c..00000000000
--- a/srcpkgs/python3-Whoosh
+++ /dev/null
@@ -1 +0,0 @@
-python-Whoosh
\ No newline at end of file
diff --git a/srcpkgs/python3-Whoosh/template b/srcpkgs/python3-Whoosh/template
new file mode 100644
index 00000000000..aa10143f91c
--- /dev/null
+++ b/srcpkgs/python3-Whoosh/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Whoosh'
+pkgname=python3-Whoosh
+version=2.7.4
+revision=3
+wrksrc="Whoosh-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Full-text indexing and searching library (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="BSD-2-Clause"
+homepage="https://bitbucket.org/mchaput/whoosh/wiki/Home"
+distfiles="${PYPI_SITE}/W/Whoosh/Whoosh-${version}.tar.gz"
+checksum=7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From 21e3dd0e3a1f655f3ae822b7632caa7510e86c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:33:49 +0700
Subject: [PATCH 100/109] python-WTForms: drop package

---
 srcpkgs/python-WTForms/template  | 32 --------------------------------
 srcpkgs/python3-WTForms          |  1 -
 srcpkgs/python3-WTForms/template | 19 +++++++++++++++++++
 3 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-WTForms/template
 delete mode 120000 srcpkgs/python3-WTForms
 create mode 100644 srcpkgs/python3-WTForms/template

diff --git a/srcpkgs/python-WTForms/template b/srcpkgs/python-WTForms/template
deleted file mode 100644
index 33f16940cb8..00000000000
--- a/srcpkgs/python-WTForms/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-WTForms'
-pkgname=python-WTForms
-version=2.2.1
-revision=2
-archs=noarch
-wrksrc="WTForms-${version}"
-build_style=python-module
-pycompile_module="wtforms"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Forms validation and rendering library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://wtforms.simplecodes.com/"
-#changelog="https://raw.githubusercontent.com/wtforms/wtforms/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/W/WTForms/WTForms-${version}.tar.gz"
-checksum=0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61
-
-post_install() {
-	vlicense LICENSE.rst LICENSE
-}
-
-python3-WTForms_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="wtforms"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.rst LICENSE
-	}
-}
diff --git a/srcpkgs/python3-WTForms b/srcpkgs/python3-WTForms
deleted file mode 120000
index 64195c4de29..00000000000
--- a/srcpkgs/python3-WTForms
+++ /dev/null
@@ -1 +0,0 @@
-python-WTForms
\ No newline at end of file
diff --git a/srcpkgs/python3-WTForms/template b/srcpkgs/python3-WTForms/template
new file mode 100644
index 00000000000..6e2d13e84b3
--- /dev/null
+++ b/srcpkgs/python3-WTForms/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-WTForms'
+pkgname=python3-WTForms
+version=2.2.1
+revision=3
+wrksrc="WTForms-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Forms validation and rendering library for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://wtforms.simplecodes.com/"
+#changelog="https://raw.githubusercontent.com/wtforms/wtforms/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/W/WTForms/WTForms-${version}.tar.gz"
+checksum=0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61
+
+post_install() {
+	vlicense LICENSE.rst LICENSE
+}

From 62e49754d3bd216159dd4a44afc38e3e31f37104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:34:08 +0700
Subject: [PATCH 101/109] python-Unidecode: drop package

---
 srcpkgs/python-Unidecode/template  | 33 ------------------------------
 srcpkgs/python3-Unidecode          |  1 -
 srcpkgs/python3-Unidecode/template | 19 +++++++++++++++++
 3 files changed, 19 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-Unidecode/template
 delete mode 120000 srcpkgs/python3-Unidecode
 create mode 100644 srcpkgs/python3-Unidecode/template

diff --git a/srcpkgs/python-Unidecode/template b/srcpkgs/python-Unidecode/template
deleted file mode 100644
index 444eb1427d6..00000000000
--- a/srcpkgs/python-Unidecode/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-Unidecode'
-pkgname=python-Unidecode
-version=1.1.1
-revision=2
-archs=noarch
-wrksrc="Unidecode-${version}"
-build_style=python-module
-pycompile_module="unidecode"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 ASCII transliterations of Unicode text"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://pypi.org/project/Unidecode/"
-distfiles="${PYPI_SITE}/U/Unidecode/Unidecode-${version}.tar.gz"
-checksum=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
-alternatives="unidecode:unidecode:/usr/bin/unidecode2"
-
-do_check() {
-	python3 setup.py test
-}
-
-python3-Unidecode_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	pycompile_module="unidecode"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="unidecode:unidecode:/usr/bin/unidecode3"
-	pkg_install() {
-		vmove usr/bin/unidecode3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-Unidecode b/srcpkgs/python3-Unidecode
deleted file mode 120000
index 39579f9fb55..00000000000
--- a/srcpkgs/python3-Unidecode
+++ /dev/null
@@ -1 +0,0 @@
-python-Unidecode
\ No newline at end of file
diff --git a/srcpkgs/python3-Unidecode/template b/srcpkgs/python3-Unidecode/template
new file mode 100644
index 00000000000..c901fe45e05
--- /dev/null
+++ b/srcpkgs/python3-Unidecode/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Unidecode'
+pkgname=python3-Unidecode
+version=1.1.1
+revision=3
+wrksrc="Unidecode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Python3 ASCII transliterations of Unicode text"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/Unidecode/"
+distfiles="${PYPI_SITE}/U/Unidecode/Unidecode-${version}.tar.gz"
+checksum=2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8
+conflicts="python-Unidecode>=0"
+
+do_check() {
+	python3 setup.py test
+}

From e14ec741bb79141379652bea893b46640e46b4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:34:39 +0700
Subject: [PATCH 102/109] python-PyOpenGL-accelerate: drop package

---
 srcpkgs/python-PyOpenGL-accelerate/template   | 28 -------------------
 srcpkgs/python3-PyOpenGL-accelerate           |  1 -
 srcpkgs/python3-PyOpenGL-accelerate/template  | 19 +++++++++++++
 .../update                                    |  0
 4 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/python-PyOpenGL-accelerate/template
 delete mode 120000 srcpkgs/python3-PyOpenGL-accelerate
 create mode 100644 srcpkgs/python3-PyOpenGL-accelerate/template
 rename srcpkgs/{python-PyOpenGL-accelerate => python3-PyOpenGL-accelerate}/update (100%)

diff --git a/srcpkgs/python-PyOpenGL-accelerate/template b/srcpkgs/python-PyOpenGL-accelerate/template
deleted file mode 100644
index e739e0d45de..00000000000
--- a/srcpkgs/python-PyOpenGL-accelerate/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-PyOpenGL-accelerate'
-pkgname=python-PyOpenGL-accelerate
-version=3.1.5
-revision=1
-wrksrc="PyOpenGL-accelerate-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel python-numpy python3-numpy"
-depends="python-numpy"
-short_desc="Acceleration code for PyOpenGL (Python2)"
-maintainer="Alain Kalker <a.c.kalker@gmail.com>"
-license="BSD-3-Clause"
-homepage="http://pyopengl.sourceforge.net/"
-distfiles="${PYPI_SITE}/P/PyOpenGL-accelerate/PyOpenGL-accelerate-${version}.tar.gz"
-checksum=12e5518b0216a478527c7ce5ddce623c3d0517adeb87226da767772e8b7f2f06
-
-post_install() {
-	vlicense license.txt LICENSE
-}
-
-python3-PyOpenGL-accelerate_package() {
-	depends="python3-numpy"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense license.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-PyOpenGL-accelerate b/srcpkgs/python3-PyOpenGL-accelerate
deleted file mode 120000
index f118fec6887..00000000000
--- a/srcpkgs/python3-PyOpenGL-accelerate
+++ /dev/null
@@ -1 +0,0 @@
-python-PyOpenGL-accelerate
\ No newline at end of file
diff --git a/srcpkgs/python3-PyOpenGL-accelerate/template b/srcpkgs/python3-PyOpenGL-accelerate/template
new file mode 100644
index 00000000000..9ddf09f5f1d
--- /dev/null
+++ b/srcpkgs/python3-PyOpenGL-accelerate/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-PyOpenGL-accelerate'
+pkgname=python3-PyOpenGL-accelerate
+version=3.1.5
+revision=1
+wrksrc="PyOpenGL-accelerate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel python3-numpy"
+depends="python3-numpy"
+short_desc="Acceleration code for PyOpenGL (Python3)"
+maintainer="Alain Kalker <a.c.kalker@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://pyopengl.sourceforge.net/"
+distfiles="${PYPI_SITE}/P/PyOpenGL-accelerate/PyOpenGL-accelerate-${version}.tar.gz"
+checksum=12e5518b0216a478527c7ce5ddce623c3d0517adeb87226da767772e8b7f2f06
+
+post_install() {
+	vlicense license.txt LICENSE
+}
diff --git a/srcpkgs/python-PyOpenGL-accelerate/update b/srcpkgs/python3-PyOpenGL-accelerate/update
similarity index 100%
rename from srcpkgs/python-PyOpenGL-accelerate/update
rename to srcpkgs/python3-PyOpenGL-accelerate/update

From fda5ddb570e059ff9e2e8b06161d887b35b17c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:35:16 +0700
Subject: [PATCH 103/109] python-PyOpenGL: drop package

---
 srcpkgs/python-PyOpenGL/template              | 29 -------------------
 srcpkgs/python3-PyOpenGL                      |  1 -
 srcpkgs/python3-PyOpenGL/template             | 18 ++++++++++++
 .../update                                    |  0
 4 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/python-PyOpenGL/template
 delete mode 120000 srcpkgs/python3-PyOpenGL
 create mode 100644 srcpkgs/python3-PyOpenGL/template
 rename srcpkgs/{python-PyOpenGL => python3-PyOpenGL}/update (100%)

diff --git a/srcpkgs/python-PyOpenGL/template b/srcpkgs/python-PyOpenGL/template
deleted file mode 100644
index 79709575673..00000000000
--- a/srcpkgs/python-PyOpenGL/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-PyOpenGL'
-pkgname=python-PyOpenGL
-version=3.1.5
-revision=1
-archs=noarch
-wrksrc="PyOpenGL-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Standard OpenGL bindings for Python2"
-maintainer="Alain Kalker <a.c.kalker@gmail.com>"
-license="BSD-3-Clause"
-homepage="http://pyopengl.sourceforge.net/"
-distfiles="${PYPI_SITE}/P/PyOpenGL/PyOpenGL-${version}.tar.gz"
-checksum=4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424
-
-post_install() {
-	vlicense license.txt LICENSE
-}
-
-python3-PyOpenGL_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense license.txt LICENSE
-	}
-}
diff --git a/srcpkgs/python3-PyOpenGL b/srcpkgs/python3-PyOpenGL
deleted file mode 120000
index 51dba8e988f..00000000000
--- a/srcpkgs/python3-PyOpenGL
+++ /dev/null
@@ -1 +0,0 @@
-python-PyOpenGL
\ No newline at end of file
diff --git a/srcpkgs/python3-PyOpenGL/template b/srcpkgs/python3-PyOpenGL/template
new file mode 100644
index 00000000000..1a2f0e1500e
--- /dev/null
+++ b/srcpkgs/python3-PyOpenGL/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-PyOpenGL'
+pkgname=python3-PyOpenGL
+version=3.1.5
+revision=2
+wrksrc="PyOpenGL-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Standard OpenGL bindings for Python3"
+maintainer="Alain Kalker <a.c.kalker@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://pyopengl.sourceforge.net/"
+distfiles="${PYPI_SITE}/P/PyOpenGL/PyOpenGL-${version}.tar.gz"
+checksum=4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424
+
+post_install() {
+	vlicense license.txt LICENSE
+}
diff --git a/srcpkgs/python-PyOpenGL/update b/srcpkgs/python3-PyOpenGL/update
similarity index 100%
rename from srcpkgs/python-PyOpenGL/update
rename to srcpkgs/python3-PyOpenGL/update

From 89e2b5dbdf8e079e7257d3557d523a7faedb8dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:36:09 +0700
Subject: [PATCH 104/109] python-MiniMock: drop package

---
 srcpkgs/python-MiniMock/template  | 31 -------------------------------
 srcpkgs/python3-MiniMock          |  1 -
 srcpkgs/python3-MiniMock/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-MiniMock/template
 delete mode 120000 srcpkgs/python3-MiniMock
 create mode 100644 srcpkgs/python3-MiniMock/template

diff --git a/srcpkgs/python-MiniMock/template b/srcpkgs/python-MiniMock/template
deleted file mode 100644
index 8b8c4f5f1e6..00000000000
--- a/srcpkgs/python-MiniMock/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-MiniMock'
-pkgname=python-MiniMock
-version=1.2.8
-revision=3
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="minimock.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="The simplest possible mock library in Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pypi.org/project/MiniMock/"
-distfiles="${PYPI_SITE}/M/MiniMock/MiniMock-${version}.tar.gz"
-checksum=5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c
-
-post_install() {
-	vlicense docs/license.txt
-}
-
-python3-MiniMock_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="minimock.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense docs/license.txt
-	}
-}
diff --git a/srcpkgs/python3-MiniMock b/srcpkgs/python3-MiniMock
deleted file mode 120000
index 8bdbc383b7f..00000000000
--- a/srcpkgs/python3-MiniMock
+++ /dev/null
@@ -1 +0,0 @@
-python-MiniMock
\ No newline at end of file
diff --git a/srcpkgs/python3-MiniMock/template b/srcpkgs/python3-MiniMock/template
new file mode 100644
index 00000000000..58b44884944
--- /dev/null
+++ b/srcpkgs/python3-MiniMock/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-MiniMock'
+pkgname=python3-MiniMock
+version=1.2.8
+revision=4
+wrksrc="MiniMock-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple possible mock library in Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pypi.org/project/MiniMock/"
+distfiles="${PYPI_SITE}/M/MiniMock/MiniMock-${version}.tar.gz"
+checksum=5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c
+
+post_install() {
+	vlicense docs/license.txt
+}

From 2392bb2690dbdf2497dad958ffa345d69a9e01bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:36:29 +0700
Subject: [PATCH 105/109] python-Markups: drop package

---
 srcpkgs/python3-Markups                       |  1 -
 .../template                                  | 25 ++++++-------------
 2 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/python3-Markups
 rename srcpkgs/{python-Markups => python3-Markups}/template (55%)

diff --git a/srcpkgs/python3-Markups b/srcpkgs/python3-Markups
deleted file mode 120000
index 1d5fbeec9ce..00000000000
--- a/srcpkgs/python3-Markups
+++ /dev/null
@@ -1 +0,0 @@
-python-Markups
\ No newline at end of file
diff --git a/srcpkgs/python-Markups/template b/srcpkgs/python3-Markups/template
similarity index 55%
rename from srcpkgs/python-Markups/template
rename to srcpkgs/python3-Markups/template
index 1eb15b49301..b72e25c6f64 100644
--- a/srcpkgs/python-Markups/template
+++ b/srcpkgs/python3-Markups/template
@@ -1,13 +1,12 @@
-# Template file for 'python-Markups'
-pkgname=python-Markups
+# Template file for 'python3-Markups'
+pkgname=python3-Markups
 version=3.0.0
-revision=3
-archs=noarch
+revision=4
 wrksrc="Markups-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Wrapper around the various text markup languages (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-markdown-math"
+short_desc="Wrapper around the various text markup languages (Python3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mitya57/pymarkups"
@@ -18,13 +17,3 @@ checksum=1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39
 post_install() {
 	vlicense LICENSE
 }
-
-python3-Markups_package() {
-	archs=noarch
-	depends="python3 python3-markdown-math"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vlicense LICENSE
-		vmove usr/lib/python3*
-	}
-}

From ccbc42277cdb3e07686d9adc5dc09c16f261e203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:38:34 +0700
Subject: [PATCH 106/109] python-Mako: drop package

---
 srcpkgs/python-Mako/template  | 37 -----------------------------------
 srcpkgs/python3-Mako          |  1 -
 srcpkgs/python3-Mako/template | 24 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-Mako/template
 delete mode 120000 srcpkgs/python3-Mako
 create mode 100644 srcpkgs/python3-Mako/template

diff --git a/srcpkgs/python-Mako/template b/srcpkgs/python-Mako/template
deleted file mode 100644
index 8cfa6722149..00000000000
--- a/srcpkgs/python-Mako/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Mako'
-pkgname=python-Mako
-version=1.1.3
-revision=1
-archs=noarch
-wrksrc="Mako-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-MarkupSafe"
-checkdepends="tox"
-short_desc="Hyperfast and lightweight templating for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.makotemplates.org/"
-distfiles="${PYPI_SITE}/M/Mako/Mako-${version}.tar.gz"
-checksum=8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27
-alternatives="mako:mako-render:/usr/bin/mako-render2"
-
-do_check() {
-	tox -e py27,py${py3_ver/./}
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-Mako_package() {
-	archs=noarch
-	depends="python3-setuptools python3-MarkupSafe"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="mako:mako-render:/usr/bin/mako-render3"
-	pkg_install() {
-		vmove usr/bin/mako-render3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-Mako b/srcpkgs/python3-Mako
deleted file mode 120000
index 3b00bf4b5bf..00000000000
--- a/srcpkgs/python3-Mako
+++ /dev/null
@@ -1 +0,0 @@
-python-Mako
\ No newline at end of file
diff --git a/srcpkgs/python3-Mako/template b/srcpkgs/python3-Mako/template
new file mode 100644
index 00000000000..3312217d823
--- /dev/null
+++ b/srcpkgs/python3-Mako/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-Mako'
+pkgname=python3-Mako
+version=1.1.3
+revision=2
+wrksrc="Mako-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-MarkupSafe"
+checkdepends="tox"
+short_desc="Hyperfast and lightweight templating for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.makotemplates.org/"
+distfiles="${PYPI_SITE}/M/Mako/Mako-${version}.tar.gz"
+checksum=8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27
+conflicts="python-Mako>=0"
+
+do_check() {
+	tox -e py27,py${py3_ver/./}
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 0c2fee1667d5156973757fc8ab6a08e0ff9f9bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:38:50 +0700
Subject: [PATCH 107/109] python-IPy: drop package

---
 srcpkgs/python-IPy/template  | 31 -------------------------------
 srcpkgs/python3-IPy          |  1 -
 srcpkgs/python3-IPy/template | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/python-IPy/template
 delete mode 120000 srcpkgs/python3-IPy
 create mode 100644 srcpkgs/python3-IPy/template

diff --git a/srcpkgs/python-IPy/template b/srcpkgs/python-IPy/template
deleted file mode 100644
index aaae9fcd002..00000000000
--- a/srcpkgs/python-IPy/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-IPy'
-pkgname=python-IPy
-version=1.00
-revision=2
-archs=noarch
-wrksrc="IPy-${version}"
-build_style=python-module
-pycompile_module="IPy.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 class for handling of IPv4 and IPv6 addresses and networks"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/autocracy/python-ipy"
-distfiles="${PYPI_SITE}/I/IPy/IPy-${version}.tar.gz"
-checksum=2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621
-
-post_install() {
-	vlicense COPYING
-}
-
-python3-IPy_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	archs=noarch
-	pycompile_module="IPy.py"
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense COPYING
-	}
-}
diff --git a/srcpkgs/python3-IPy b/srcpkgs/python3-IPy
deleted file mode 120000
index 1da828b7b17..00000000000
--- a/srcpkgs/python3-IPy
+++ /dev/null
@@ -1 +0,0 @@
-python-IPy
\ No newline at end of file
diff --git a/srcpkgs/python3-IPy/template b/srcpkgs/python3-IPy/template
new file mode 100644
index 00000000000..b5fc36135ad
--- /dev/null
+++ b/srcpkgs/python3-IPy/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-IPy'
+pkgname=python3-IPy
+version=1.00
+revision=3
+wrksrc="IPy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 class for handling of IPv4 and IPv6 addresses and networks"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/autocracy/python-ipy"
+distfiles="${PYPI_SITE}/I/IPy/IPy-${version}.tar.gz"
+checksum=2f2bf658a858d43868d8a4352b3889cf78c66e2ce678b300dcf518c9149ba621
+
+post_install() {
+	vlicense COPYING
+}

From 54f4444b604b7058ce8e724d77efe697e13f1dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 20 Sep 2020 23:39:07 +0700
Subject: [PATCH 108/109] python-Django: drop package

---
 srcpkgs/python-Django/template | 22 ----------------------
 srcpkgs/python-Django/update   |  1 -
 2 files changed, 23 deletions(-)
 delete mode 100644 srcpkgs/python-Django/template
 delete mode 100644 srcpkgs/python-Django/update

diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template
deleted file mode 100644
index 6549f5c0fae..00000000000
--- a/srcpkgs/python-Django/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-Django'
-pkgname=python-Django
-version=1.11.29
-revision=1
-archs=noarch
-wrksrc="Django-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-pytz python-setuptools"
-short_desc="High-level Python2 Web framework"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://www.djangoproject.com/"
-distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
-checksum=4200aefb6678019a0acf0005cd14cfce3a5e6b9b90d06145fcdd2e474ad4329c
-alternatives="django:django-admin:/usr/bin/django-admin2"
-
-post_install() {
-	vlicense LICENSE
-	rm -f ${DESTDIR}/usr/bin/django-admin.py*
-	mv ${DESTDIR}/usr/bin/django-admin{,2}
-}
diff --git a/srcpkgs/python-Django/update b/srcpkgs/python-Django/update
deleted file mode 100644
index ce4668c41ee..00000000000
--- a/srcpkgs/python-Django/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a* *b* *rc* [2-9]*"

From 7f190d40d56f69b679b83b47c32d63d4b8a8e335 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 15 Sep 2020 16:58:55 +1000
Subject: [PATCH 109/109] fonttools: remove noarch.

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

diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template
index f94f794b2a2..09f0db8bece 100644
--- a/srcpkgs/fonttools/template
+++ b/srcpkgs/fonttools/template
@@ -1,8 +1,7 @@
 # Template file for 'fonttools'
 pkgname=fonttools
 version=4.8.1
-revision=1
-archs=noarch
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Closed]: Python 2 drop (cont'd) #24995
  2020-09-21 11:43 [PR PATCH] Python 2 drop (cont'd) #24995 sgn
  2020-09-23 14:44 ` [PR PATCH] [Updated] " sgn
@ 2020-09-24 15:09 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2020-09-24 15:09 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

Python 2 drop (cont'd) #24995
https://github.com/void-linux/void-packages/pull/25008

Description:
Continue of #24995, split for Travis

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-24 15:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-21 11:43 [PR PATCH] Python 2 drop (cont'd) #24995 sgn
2020-09-23 14:44 ` [PR PATCH] [Updated] " sgn
2020-09-24 15:09 ` [PR PATCH] [Closed]: " sgn

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).