Re: [PR PATCH] [Updated] Python 2 drop

Github messages for voidlinux
 help / color / mirror / Atom feed

From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Python 2 drop
Date: Sun, 20 Sep 2020 17:48:17 +0200	[thread overview]
Message-ID: <20200920154817.Mr3JTwmNSAdTRkk-K08YryrLOxlD0l2hwmwMAvVCc2Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24995@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 500 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
https://github.com/void-linux/void-packages/pull/24995

Python 2 drop
I pushed part of this out.
Now I think I should let other people have a comment.

Things was filtered by:
- python libraries, with no other executable depends on it or no non-python depends on it

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

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

From 766798fc930605a50b5db7da1834be8ec3fb08fe Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 20 Sep 2020 14:22:24 +0200
Subject: [PATCH 01/68] logswan: update to 2.1.7.

---
 srcpkgs/logswan/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/logswan/template b/srcpkgs/logswan/template
index 3413a617c11..721e95f403a 100644
--- a/srcpkgs/logswan/template
+++ b/srcpkgs/logswan/template
@@ -1,16 +1,16 @@
 # Template file for 'logswan'
 pkgname=logswan
-version=2.1.6
+version=2.1.7
 revision=1
 build_style=cmake
 makedepends="jansson-devel libmaxminddb-devel"
 short_desc="Fast Web log analyzer using probabilistic data structures"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="BSD-2-clause"
+license="BSD-2-Clause"
 homepage="https://www.logswan.org/"
 changelog="https://github.com/fcambus/logswan/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/logswan/archive/${version}.tar.gz"
-checksum=76621bb0aa030fe9bde3569cbfa809ec0ae94a2b52a5ae4321f5ba4e67416223
+checksum=8f464193dcd5b3b1a02072c3add2bea3d9522d53dd541040cad4db9708f82e61
 
 post_install() {
 	vlicense LICENSE

From d8845fb4a812df20d7005c972909264d87b062be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 20 Sep 2020 08:43:33 -0400
Subject: [PATCH 02/68] python3-breathe: update to 4.22.0.

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

diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template
index b2876c804a4..add87c37eba 100644
--- a/srcpkgs/python3-breathe/template
+++ b/srcpkgs/python3-breathe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-breathe'
 pkgname=python3-breathe
-version=4.21.0
+version=4.22.0
 revision=1
 wrksrc="breathe-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/michaeljones/breathe"
 distfiles="https://github.com/michaeljones/breathe/archive/v${version}.tar.gz"
-checksum=7f97756a1b7f7998377b1153a976bf0d2879bb3ca1cb7bc846f455d37ca87ead
+checksum=4112a9901e668aa5ba0e8835d4b04a26cbcc787f1f44df919d4b68764a52cfba
 
 post_install() {
 	vlicense LICENSE

From cc6c3724d14ed812e9f2bd6e8ea8f442aad17f11 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 17:18:03 +0700
Subject: [PATCH 03/68] python-redis: drop package

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

diff --git a/srcpkgs/python-redis/template b/srcpkgs/python-redis/template
deleted file mode 100644
index 68eb4ee09e9..00000000000
--- a/srcpkgs/python-redis/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-redis'
-pkgname=python-redis
-version=3.5.3
-revision=1
-archs=noarch
-wrksrc="redis-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 client for Redis key-value store"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/andymccurdy/redis-py"
-distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
-checksum=0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-redis_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-redis b/srcpkgs/python3-redis
deleted file mode 120000
index f39eb4c3b3c..00000000000
--- a/srcpkgs/python3-redis
+++ /dev/null
@@ -1 +0,0 @@
-python-redis
\ No newline at end of file
diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
new file mode 100644
index 00000000000..dea6175ef59
--- /dev/null
+++ b/srcpkgs/python3-redis/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-redis'
+pkgname=python3-redis
+version=3.5.3
+revision=2
+wrksrc="redis-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 client for Redis key-value store"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/andymccurdy/redis-py"
+distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
+checksum=0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2
+
+post_install() {
+	vlicense LICENSE
+}

From ad5333f1b34d69bb8fdd20f4fc10943e84db57c6 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 17:18:20 +0700
Subject: [PATCH 04/68] python-rebulk: drop package

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

diff --git a/srcpkgs/python-rebulk/template b/srcpkgs/python-rebulk/template
deleted file mode 100644
index 3bc58c3a7dd..00000000000
--- a/srcpkgs/python-rebulk/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-rebulk'
-pkgname=python-rebulk
-version=2.0.1
-revision=1
-archs=noarch
-wrksrc="rebulk-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-six"
-short_desc="Define search patterns in bulk to perform advanced matching (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="MIT"
-homepage="https://github.com/Toilal/rebulk"
-distfiles="${PYPI_SITE}/r/rebulk/rebulk-${version}.tar.gz"
-checksum=320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-rebulk_package() {
-	archs=noarch
-	depends="python3 python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-rebulk b/srcpkgs/python3-rebulk
deleted file mode 120000
index 32bfe7322a5..00000000000
--- a/srcpkgs/python3-rebulk
+++ /dev/null
@@ -1 +0,0 @@
-python-rebulk
\ No newline at end of file
diff --git a/srcpkgs/python3-rebulk/template b/srcpkgs/python3-rebulk/template
new file mode 100644
index 00000000000..ce6b994a5b0
--- /dev/null
+++ b/srcpkgs/python3-rebulk/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-rebulk'
+pkgname=python3-rebulk
+version=2.0.1
+revision=2
+wrksrc="rebulk-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-six"
+short_desc="Define search patterns in bulk to perform advanced matching (Python3)"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="MIT"
+homepage="https://github.com/Toilal/rebulk"
+distfiles="${PYPI_SITE}/r/rebulk/rebulk-${version}.tar.gz"
+checksum=320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a
+
+post_install() {
+	vlicense LICENSE
+}

From 3fe3f1aa5a7ce1c99f3b282897abf9254a60b720 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 17:18:36 +0700
Subject: [PATCH 05/68] python-readability-lxml: drop package

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

diff --git a/srcpkgs/python-readability-lxml/template b/srcpkgs/python-readability-lxml/template
deleted file mode 100644
index ace92da477b..00000000000
--- a/srcpkgs/python-readability-lxml/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-readability-lxml'
-pkgname=python-readability-lxml
-version=0.8.1
-revision=1
-archs=noarch
-wrksrc="readability-lxml-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-lxml"
-short_desc="Fast html to text parser"
-maintainer="Benjamín Albiñana <benalb@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/buriy/python-readability"
-distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz"
-checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1
-
-python3-readability-lxml_package() {
-	archs=noarch
-	depends="python3-lxml"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-readability-lxml b/srcpkgs/python3-readability-lxml
deleted file mode 120000
index c9c8014c795..00000000000
--- a/srcpkgs/python3-readability-lxml
+++ /dev/null
@@ -1 +0,0 @@
-python-readability-lxml
\ No newline at end of file
diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
new file mode 100644
index 00000000000..00a446d3178
--- /dev/null
+++ b/srcpkgs/python3-readability-lxml/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-readability-lxml'
+pkgname=python3-readability-lxml
+version=0.8.1
+revision=2
+wrksrc="readability-lxml-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-lxml"
+short_desc="Fast html to text parser"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/buriy/python-readability"
+distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz"
+checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1

From 8a30517012c34afe9c7aeddb8cf86dc41f98d7ff 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 17:18:59 +0700
Subject: [PATCH 06/68] python-SPARQLWrapper: drop package

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

diff --git a/srcpkgs/python-SPARQLWrapper/template b/srcpkgs/python-SPARQLWrapper/template
deleted file mode 100644
index 8d2db9a02b3..00000000000
--- a/srcpkgs/python-SPARQLWrapper/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-SPARQLWrapper'
-pkgname=python-SPARQLWrapper
-version=1.8.4
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="SPARQLWrapper"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-rdflib"
-short_desc="SPARQL Endpoint interface to Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="W3C"
-homepage="https://rdflib.github.io/sparqlwrapper/"
-distfiles="${PYPI_SITE}/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz"
-checksum=21928e7a97f565e772cdeeb0abad428960f4307e3a13dbdd8f6d3da8a6a506c9
-
-python3-SPARQLWrapper_package() {
-	archs=noarch
-	depends="python3-rdflib"
-	pycompile_module="SPARQLWrapper"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-SPARQLWrapper b/srcpkgs/python3-SPARQLWrapper
deleted file mode 120000
index da43e69100c..00000000000
--- a/srcpkgs/python3-SPARQLWrapper
+++ /dev/null
@@ -1 +0,0 @@
-python-SPARQLWrapper
\ No newline at end of file
diff --git a/srcpkgs/python3-SPARQLWrapper/template b/srcpkgs/python3-SPARQLWrapper/template
new file mode 100644
index 00000000000..5a6da8a548c
--- /dev/null
+++ b/srcpkgs/python3-SPARQLWrapper/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-SPARQLWrapper'
+pkgname=python3-SPARQLWrapper
+version=1.8.4
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-rdflib"
+short_desc="SPARQL Endpoint interface to Python (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="W3C"
+homepage="https://rdflib.github.io/sparqlwrapper/"
+distfiles="${PYPI_SITE}/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz"
+checksum=21928e7a97f565e772cdeeb0abad428960f4307e3a13dbdd8f6d3da8a6a506c9

From fbb5fd1ed02c1b9a64a016d928ed0dbcf89831c0 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 17:21:27 +0700
Subject: [PATCH 07/68] python-raven: drop package

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

diff --git a/srcpkgs/python-raven/template b/srcpkgs/python-raven/template
deleted file mode 100644
index 87382c21602..00000000000
--- a/srcpkgs/python-raven/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-raven'
-pkgname=python-raven
-version=6.10.0
-revision=2
-archs=noarch
-wrksrc="raven-${version}"
-build_style=python-module
-pycompile_module="raven"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="ca-certificates python-setuptools python-contextlib2"
-short_desc="Python2 client for Sentry"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/getsentry/raven-python"
-distfiles="${PYPI_SITE}/r/raven/raven-${version}.tar.gz"
-checksum=3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54
-alternatives="raven:raven:/usr/bin/raven2"
-
-post_install() {
-	# use system ca-certificates
-	for py_sitelib in $py2_sitelib $py3_sitelib; do
-		rm -f ${DESTDIR}/${py_sitelib}/raven/data/cacert.pem
-		ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py_sitelib}/raven/data/cacert.pem
-	done
-	vlicense LICENSE
-}
-
-python3-raven_package() {
-	archs=noarch
-	pycompile_module="raven"
-	depends="ca-certificates python3-setuptools"
-	alternatives="raven:raven:/usr/bin/raven3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-raven b/srcpkgs/python3-raven
deleted file mode 120000
index 395070cb4e4..00000000000
--- a/srcpkgs/python3-raven
+++ /dev/null
@@ -1 +0,0 @@
-python-raven
\ No newline at end of file
diff --git a/srcpkgs/python3-raven/template b/srcpkgs/python3-raven/template
new file mode 100644
index 00000000000..831dc90aa97
--- /dev/null
+++ b/srcpkgs/python3-raven/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-raven'
+pkgname=python3-raven
+version=6.10.0
+revision=3
+wrksrc="raven-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="ca-certificates python3-setuptools"
+short_desc="Python3 client for Sentry"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/getsentry/raven-python"
+distfiles="${PYPI_SITE}/r/raven/raven-${version}.tar.gz"
+checksum=3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54
+conflicts="python-raven>=0"
+
+post_install() {
+	# use system ca-certificates
+	rm -f ${DESTDIR}/${py3_sitelib}/raven/data/cacert.pem
+	ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py3_sitelib}/raven/data/cacert.pem
+	vlicense LICENSE
+}

From cc7851574270b7418c955cc07b90725485b0beb9 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 17:21:39 +0700
Subject: [PATCH 08/68] python-rarfile: drop package

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

diff --git a/srcpkgs/python-rarfile/template b/srcpkgs/python-rarfile/template
deleted file mode 100644
index 83ff75c6e03..00000000000
--- a/srcpkgs/python-rarfile/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-rarfile'
-pkgname=python-rarfile
-version=4.0
-revision=1
-archs=noarch
-wrksrc="rarfile-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="RAR archive reader for Python (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="ISC"
-homepage="https://github.com/markokr/rarfile"
-changelog="https://github.com/markokr/rarfile/raw/master/doc/news.rst"
-distfiles="${PYPI_SITE}/r/rarfile/rarfile-${version}.tar.gz"
-checksum=67548769229c5bda0827c1663dce3f54644f9dbfba4ae86d4da2b2afd3e602a1
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-rarfile_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-rarfile b/srcpkgs/python3-rarfile
deleted file mode 120000
index e93143007a3..00000000000
--- a/srcpkgs/python3-rarfile
+++ /dev/null
@@ -1 +0,0 @@
-python-rarfile
\ No newline at end of file
diff --git a/srcpkgs/python3-rarfile/template b/srcpkgs/python3-rarfile/template
new file mode 100644
index 00000000000..071cbfbb1ad
--- /dev/null
+++ b/srcpkgs/python3-rarfile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-rarfile'
+pkgname=python3-rarfile
+version=4.0
+revision=2
+wrksrc="rarfile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="RAR archive reader for Python (Python3)"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="ISC"
+homepage="https://github.com/markokr/rarfile"
+changelog="https://github.com/markokr/rarfile/raw/master/doc/news.rst"
+distfiles="${PYPI_SITE}/r/rarfile/rarfile-${version}.tar.gz"
+checksum=67548769229c5bda0827c1663dce3f54644f9dbfba4ae86d4da2b2afd3e602a1
+
+post_install() {
+	vlicense LICENSE
+}

From c8d7ce6b6e38a36191c3206310d6bb709b97d692 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 17:22:38 +0700
Subject: [PATCH 09/68] python-random2: drop package

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

diff --git a/srcpkgs/python-random2/template b/srcpkgs/python-random2/template
deleted file mode 100644
index 2603cae3584..00000000000
--- a/srcpkgs/python-random2/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-random2'
-pkgname=python-random2
-version=1.0.1
-revision=4
-archs=noarch
-wrksrc="random2-${version}"
-build_style=python-module
-pycompile_module="random2.py"
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python-setuptools"
-short_desc="Python 3 compatible Python 2 random Module"
-maintainer="Wilson Birney <wpb@360scada.com>"
-license="Python-2.0"
-homepage="https://pypi.org/project/random2/"
-distfiles="${PYPI_SITE}/r/random2/random2-${version}.zip"
-checksum=34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007
-
-python3-random2_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	pycompile_module="random2.py"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-random2 b/srcpkgs/python3-random2
deleted file mode 120000
index 8aa0d4c4b48..00000000000
--- a/srcpkgs/python3-random2
+++ /dev/null
@@ -1 +0,0 @@
-python-random2
\ No newline at end of file
diff --git a/srcpkgs/python3-random2/template b/srcpkgs/python3-random2/template
new file mode 100644
index 00000000000..6f5b4a9a719
--- /dev/null
+++ b/srcpkgs/python3-random2/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-random2'
+pkgname=python3-random2
+version=1.0.1
+revision=5
+wrksrc="random2-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3-setuptools"
+short_desc="Python 3 compatible Python 2 random Module"
+maintainer="Wilson Birney <wpb@360scada.com>"
+license="Python-2.0"
+homepage="https://pypi.org/project/random2/"
+distfiles="${PYPI_SITE}/r/random2/random2-${version}.zip"
+checksum=34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007

From bb3f2a3d25fd0c4beef558f5ade7fc0d19314c99 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 17:22:58 +0700
Subject: [PATCH 10/68] python-qrcode: drop package

---
 srcpkgs/python-qrcode/template                | 36 -------------------
 srcpkgs/python3-qrcode                        |  1 -
 .../INSTALL.msg                               |  0
 srcpkgs/python3-qrcode/template               | 23 ++++++++++++
 4 files changed, 23 insertions(+), 37 deletions(-)
 delete mode 100644 srcpkgs/python-qrcode/template
 delete mode 120000 srcpkgs/python3-qrcode
 rename srcpkgs/{python-qrcode => python3-qrcode}/INSTALL.msg (100%)
 create mode 100644 srcpkgs/python3-qrcode/template

diff --git a/srcpkgs/python-qrcode/template b/srcpkgs/python-qrcode/template
deleted file mode 100644
index bf35c82757e..00000000000
--- a/srcpkgs/python-qrcode/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'python-qrcode'
-pkgname=python-qrcode
-version=6.1
-revision=2
-archs=noarch
-wrksrc="qrcode-${version}"
-build_style=python-module
-pycompile_module="qrcode"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-checkdepends="python3-six"
-short_desc="QR Code image generator (Python2)"
-maintainer="Charles E. Lehner <cel@celehner.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/lincolnloop/python-qrcode"
-distfiles="${PYPI_SITE}/q/qrcode/qrcode-${version}.tar.gz"
-checksum=505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369
-
-do_check() {
-	python3 setup.py test
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-qrcode_package() {
-	archs=noarch
-	depends="python3-six"
-	pycompile_module="qrcode"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-qrcode b/srcpkgs/python3-qrcode
deleted file mode 120000
index 5c162e5ab4c..00000000000
--- a/srcpkgs/python3-qrcode
+++ /dev/null
@@ -1 +0,0 @@
-python-qrcode
\ No newline at end of file
diff --git a/srcpkgs/python-qrcode/INSTALL.msg b/srcpkgs/python3-qrcode/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-qrcode/INSTALL.msg
rename to srcpkgs/python3-qrcode/INSTALL.msg
diff --git a/srcpkgs/python3-qrcode/template b/srcpkgs/python3-qrcode/template
new file mode 100644
index 00000000000..1d287bafa4e
--- /dev/null
+++ b/srcpkgs/python3-qrcode/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-qrcode'
+pkgname=python3-qrcode
+version=6.1
+revision=3
+wrksrc="qrcode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+checkdepends="python3-six"
+short_desc="QR Code image generator (Python3)"
+maintainer="Charles E. Lehner <cel@celehner.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/lincolnloop/python-qrcode"
+distfiles="${PYPI_SITE}/q/qrcode/qrcode-${version}.tar.gz"
+checksum=505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369
+
+do_check() {
+	python3 setup.py test
+}
+
+post_install() {
+	vlicense LICENSE
+}

From ba00c5f781f281f017b2b21bb36243daabe1bf07 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 17:23:34 +0700
Subject: [PATCH 11/68] python-pyzbar: drop package

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

diff --git a/srcpkgs/python-pyzbar/template b/srcpkgs/python-pyzbar/template
deleted file mode 100644
index 35b568eb4e6..00000000000
--- a/srcpkgs/python-pyzbar/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-pyzbar'
-pkgname=python-pyzbar
-version=0.1.8
-revision=2
-archs=noarch
-wrksrc="pyzbar-${version}"
-build_style=python-module
-pycompile_module="pyzbar"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="libzbar python-enum34 python-pathlib"
-short_desc="Read one-dimensional barcodes and QR codes"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/NaturalHistoryMuseum/pyzbar/"
-distfiles="https://github.com/NaturalHistoryMuseum/pyzbar/archive/v${version}.tar.gz"
-checksum=f51c82c2864f8e5a8d44f55853e027f8cbc592324b7afffa62100f2f9c54cbdb
-alternatives="pyzbar:read_zbar:/usr/bin/read_zbar.py2"
-
-post_install() {
-	vlicense LICENSE.txt
-	# These only exec read_zbar.py{2,3}
-	rm "$DESTDIR"/usr/bin/read_zbar{2,3}
-}
-
-python3-pyzbar_package() {
-	archs=noarch
-	pycompile_module="pyzbar"
-	depends="libzbar python3"
-	alternatives="pyzbar:read_zbar:/usr/bin/read_zbar.py3"
-	pkg_install() {
-		vlicense LICENSE.txt
-		vmove usr/lib/python3*
-		vmove usr/bin/read_zbar.py3
-	}
-}
diff --git a/srcpkgs/python3-pyzbar b/srcpkgs/python3-pyzbar
deleted file mode 120000
index 18fb27518e6..00000000000
--- a/srcpkgs/python3-pyzbar
+++ /dev/null
@@ -1 +0,0 @@
-python-pyzbar
\ No newline at end of file
diff --git a/srcpkgs/python3-pyzbar/template b/srcpkgs/python3-pyzbar/template
new file mode 100644
index 00000000000..b3cb17aacef
--- /dev/null
+++ b/srcpkgs/python3-pyzbar/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pyzbar'
+pkgname=python3-pyzbar
+version=0.1.8
+revision=3
+wrksrc="pyzbar-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="libzbar python3"
+short_desc="Read one-dimensional barcodes and QR codes"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/NaturalHistoryMuseum/pyzbar/"
+distfiles="https://github.com/NaturalHistoryMuseum/pyzbar/archive/v${version}.tar.gz"
+checksum=f51c82c2864f8e5a8d44f55853e027f8cbc592324b7afffa62100f2f9c54cbdb
+conflicts="python-pyzbar>=0"
+
+post_install() {
+	vlicense LICENSE.txt
+	# These only exec read_zbar.py
+	rm "$DESTDIR"/usr/bin/read_zbar
+}

From c4a9cba486ff99e172d931863dc2c27b88690252 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 17:29:53 +0700
Subject: [PATCH 12/68] python-pyx: drop package

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

diff --git a/srcpkgs/python-pyx/template b/srcpkgs/python-pyx/template
deleted file mode 100644
index 1ece52764ab..00000000000
--- a/srcpkgs/python-pyx/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'python-pyx'
-pkgname=python-pyx
-version=0.12.1
-revision=4
-archs=noarch
-wrksrc="PyX-${version}"
-build_style=python2-module
-pycompile_module="pyx"
-hostmakedepends="python-setuptools"
-depends="python virtual?tex"
-short_desc="Python library for the creation of PostScript and PDF files"
-maintainer="cipr3s <cipr3s@gmx.com>"
-license="GPL-2.0-or-later"
-homepage="http://pyx.sourceforge.net"
-distfiles="${PYPI_SITE}/p/pyx/pyx-${version}.tar.gz"
-checksum=e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e
diff --git a/srcpkgs/python-pyx/update b/srcpkgs/python-pyx/update
deleted file mode 100644
index 49150369dd8..00000000000
--- a/srcpkgs/python-pyx/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="0.1[34]*"

From c376a92b3f4fc3ffa5b2108b10c9be6e56c599c8 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 17:30:36 +0700
Subject: [PATCH 13/68] python-pyudev: drop package

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

diff --git a/srcpkgs/python-pyudev/template b/srcpkgs/python-pyudev/template
deleted file mode 100644
index 2ec53088636..00000000000
--- a/srcpkgs/python-pyudev/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-pyudev'
-pkgname=python-pyudev
-version=0.21.0
-revision=3
-archs=noarch
-wrksrc="pyudev-${version}"
-build_style=python-module
-pycompile_module="pyudev"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-six"
-short_desc="Python bindings to libudev (Python2)"
-maintainer="Luca Weiss <luca@z3ntu.xyz>"
-license="LGPL-2.1"
-homepage="https://github.com/pyudev/pyudev"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5f4625f89347e465731866ddbe042a055bbc5092577356aa3d089ac5fb8efd94
-
-python3-pyudev_package() {
-	archs=noarch
-	depends="python3 python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pyudev b/srcpkgs/python3-pyudev
deleted file mode 120000
index 3b10364e2c9..00000000000
--- a/srcpkgs/python3-pyudev
+++ /dev/null
@@ -1 +0,0 @@
-python-pyudev
\ No newline at end of file
diff --git a/srcpkgs/python3-pyudev/template b/srcpkgs/python3-pyudev/template
new file mode 100644
index 00000000000..8b741a5f1a5
--- /dev/null
+++ b/srcpkgs/python3-pyudev/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-pyudev'
+pkgname=python3-pyudev
+version=0.21.0
+revision=4
+wrksrc="pyudev-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-six"
+short_desc="Python bindings to libudev (Python3)"
+maintainer="Luca Weiss <luca@z3ntu.xyz>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/pyudev/pyudev"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=5f4625f89347e465731866ddbe042a055bbc5092577356aa3d089ac5fb8efd94

From 1a0b20fe253196e2266c0479fd4f3aa806226fe9 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 17:31:15 +0700
Subject: [PATCH 14/68] python-pytest-fixture-config: drop package

---
 srcpkgs/python-pytest-fixture-config/template | 38 -------------------
 srcpkgs/python3-pytest-fixture-config         |  1 -
 .../python3-pytest-fixture-config/template    | 26 +++++++++++++
 3 files changed, 26 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/python-pytest-fixture-config/template
 delete mode 120000 srcpkgs/python3-pytest-fixture-config
 create mode 100644 srcpkgs/python3-pytest-fixture-config/template

diff --git a/srcpkgs/python-pytest-fixture-config/template b/srcpkgs/python-pytest-fixture-config/template
deleted file mode 100644
index 14255af8a35..00000000000
--- a/srcpkgs/python-pytest-fixture-config/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-pytest-fixture-config'
-pkgname=python-pytest-fixture-config
-version=1.3.0
-revision=3
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="pytest_fixture_config.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-pytest"
-checkdepends="python3-pytest"
-short_desc="Fixture configuration utils for py.test (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/manahl/pytest-plugins"
-distfiles="${PYPI_SITE}/p/${pkgname/python-/}/${pkgname/python-/}-${version}.tar.gz"
-checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08
-
-pre_build() {
-	sed -i '/setup_requires/d' common_setup.py
-}
-do_check() {
-	python3 setup.py test
-}
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pytest-fixture-config_package() {
-	archs=noarch
-	depends="python3-pytest"
-	pycompile_module="pytest_fixture_config.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pytest-fixture-config b/srcpkgs/python3-pytest-fixture-config
deleted file mode 120000
index aa96289d741..00000000000
--- a/srcpkgs/python3-pytest-fixture-config
+++ /dev/null
@@ -1 +0,0 @@
-python-pytest-fixture-config
\ No newline at end of file
diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template
new file mode 100644
index 00000000000..8829948896a
--- /dev/null
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-pytest-fixture-config'
+pkgname=python3-pytest-fixture-config
+_pkgname=${pkgname#*-}
+version=1.3.0
+revision=4
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest"
+checkdepends="python3-pytest"
+short_desc="Fixture configuration utils for py.test (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/manahl/pytest-plugins"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08
+
+pre_build() {
+	sed -i '/setup_requires/d' common_setup.py
+}
+do_check() {
+	python3 setup.py test
+}
+post_install() {
+	vlicense LICENSE
+}

From 310b3718972541c0d37d5fd9856468119cbf8deb 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 17:32:52 +0700
Subject: [PATCH 15/68] python-pytest-mock: drop package

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

diff --git a/srcpkgs/python-pytest-mock/template b/srcpkgs/python-pytest-mock/template
deleted file mode 100644
index 240e8773aaa..00000000000
--- a/srcpkgs/python-pytest-mock/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-pytest-mock'
-pkgname=python-pytest-mock
-version=1.10.4
-revision=2
-archs=noarch
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="pytest_mock.py _pytest_mock_version.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-pytest python-mock"
-checkdepends="$depends"
-short_desc="Thin-wrapper around mock for easier use with py.test (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pytest-dev/pytest-mock/"
-distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
-checksum=5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568
-
-pre_build() {
-	sed -i setup.py \
-		-e '/setup_requires=/d' \
-		-e "s|use_scm_version=.*|version='${version}',|"
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pytest-mock_package() {
-	archs=noarch
-	depends="python3-pytest"
-	pycompile_module="pytest_mock.py _pytest_mock_version.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pytest-mock b/srcpkgs/python3-pytest-mock
deleted file mode 120000
index d22a274a989..00000000000
--- a/srcpkgs/python3-pytest-mock
+++ /dev/null
@@ -1 +0,0 @@
-python-pytest-mock
\ No newline at end of file
diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template
new file mode 100644
index 00000000000..bde86441bf6
--- /dev/null
+++ b/srcpkgs/python3-pytest-mock/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-pytest-mock'
+pkgname=python3-pytest-mock
+version=1.10.4
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytest"
+checkdepends="$depends"
+short_desc="Thin-wrapper around mock for easier use with py.test (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pytest-dev/pytest-mock/"
+distfiles="${PYPI_SITE}/p/pytest-mock/pytest-mock-${version}.tar.gz"
+checksum=5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568
+
+pre_build() {
+	sed -i setup.py \
+		-e '/setup_requires=/d' \
+		-e "s|use_scm_version=.*|version='${version}',|"
+}
+
+post_install() {
+	vlicense LICENSE
+}

From e82835a69fab73661ed32123aabc1bbcfc549a6c 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 17:33:45 +0700
Subject: [PATCH 16/68] python-pysrt: drop package

---
 srcpkgs/python-pysrt/template  | 27 ---------------------------
 srcpkgs/python3-pysrt          |  1 -
 srcpkgs/python3-pysrt/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/python-pysrt/template
 delete mode 120000 srcpkgs/python3-pysrt
 create mode 100644 srcpkgs/python3-pysrt/template

diff --git a/srcpkgs/python-pysrt/template b/srcpkgs/python-pysrt/template
deleted file mode 100644
index be742c08ce4..00000000000
--- a/srcpkgs/python-pysrt/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-pysrt'
-pkgname=python-pysrt
-version=1.1.2
-revision=1
-archs=noarch
-wrksrc="pysrt-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-chardet"
-short_desc="SubRip (.srt) subtitle parser and writer (Python2)"
-maintainer="Daniel Santana <daniel@santana.tech>"
-license="GPL-3.0-only"
-homepage="https://github.com/byroot/pysrt"
-distfiles="${PYPI_SITE}/p/pysrt/pysrt-${version}.tar.gz"
-checksum=b4f844ba33e4e7743e9db746492f3a193dc0bc112b153914698e7c1cdeb9b0b9
-alternatives="srt:srt:/usr/bin/srt2"
-
-python3-pysrt_package() {
-	archs=noarch
-	depends="python3 python3-chardet"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="srt:srt:/usr/bin/srt3"
-	pkg_install() {
-		vmove usr/bin/srt3
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pysrt b/srcpkgs/python3-pysrt
deleted file mode 120000
index 423da59f865..00000000000
--- a/srcpkgs/python3-pysrt
+++ /dev/null
@@ -1 +0,0 @@
-python-pysrt
\ No newline at end of file
diff --git a/srcpkgs/python3-pysrt/template b/srcpkgs/python3-pysrt/template
new file mode 100644
index 00000000000..4fd225c206a
--- /dev/null
+++ b/srcpkgs/python3-pysrt/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pysrt'
+pkgname=python3-pysrt
+version=1.1.2
+revision=2
+wrksrc="pysrt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-chardet"
+short_desc="SubRip (.srt) subtitle parser and writer (Python3)"
+maintainer="Daniel Santana <daniel@santana.tech>"
+license="GPL-3.0-only"
+homepage="https://github.com/byroot/pysrt"
+distfiles="${PYPI_SITE}/p/pysrt/pysrt-${version}.tar.gz"
+checksum=b4f844ba33e4e7743e9db746492f3a193dc0bc112b153914698e7c1cdeb9b0b9
+conflicts="python-pysrt>=0"

From 822feb9f40c260ed8ab289e9b2a7a83b00a36470 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 17:33:59 +0700
Subject: [PATCH 17/68] python-pysocks: drop package

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

diff --git a/srcpkgs/python-pysocks/template b/srcpkgs/python-pysocks/template
deleted file mode 100644
index ca508a4a7cc..00000000000
--- a/srcpkgs/python-pysocks/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pysocks'
-pkgname=python-pysocks
-version=1.7.0
-revision=1
-archs=noarch
-wrksrc="PySocks-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 SOCKS client module"
-maintainer="Benjamín Albiñana <benalb@gmail.com>"
-license="BSD-3-Clause"
-homepage="https://github.com/Anorov/PySocks"
-distfiles="https://github.com/Anorov/PySocks/archive/${version}.tar.gz"
-checksum=b6dbd9daf8ebe75c9f76b54c9747d3d1f1d5ac54d540e44b7eb93936ae38b01a
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pysocks_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vlicense LICENSE
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pysocks b/srcpkgs/python3-pysocks
deleted file mode 120000
index 5700cac8fb7..00000000000
--- a/srcpkgs/python3-pysocks
+++ /dev/null
@@ -1 +0,0 @@
-python-pysocks
\ No newline at end of file
diff --git a/srcpkgs/python3-pysocks/template b/srcpkgs/python3-pysocks/template
new file mode 100644
index 00000000000..f7b3d4f57c3
--- /dev/null
+++ b/srcpkgs/python3-pysocks/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pysocks'
+pkgname=python3-pysocks
+version=1.7.0
+revision=2
+wrksrc="PySocks-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 SOCKS client module"
+maintainer="Benjamín Albiñana <benalb@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/Anorov/PySocks"
+distfiles="https://github.com/Anorov/PySocks/archive/${version}.tar.gz"
+checksum=b6dbd9daf8ebe75c9f76b54c9747d3d1f1d5ac54d540e44b7eb93936ae38b01a
+
+post_install() {
+	vlicense LICENSE
+}

From 6263159e5e0d7209636eff245e2f4c664e19d452 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 17:34:57 +0700
Subject: [PATCH 18/68] python-pyrfc3339: drop package

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

diff --git a/srcpkgs/python-pyrfc3339/template b/srcpkgs/python-pyrfc3339/template
deleted file mode 100644
index cd81c4d0624..00000000000
--- a/srcpkgs/python-pyrfc3339/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pyrfc3339'
-pkgname=python-pyrfc3339
-version=1.1
-revision=2
-archs=noarch
-build_style=python-module
-pycompile_module="pyrfc3339"
-wrksrc="pyRFC3339-${version}"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-pytz"
-short_desc="Python2 library for generating and parsing RFC 3339 timestamps"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/kurtraschke/pyRFC3339"
-distfiles="${PYPI_SITE}/p/pyRFC3339/pyRFC3339-${version}.tar.gz"
-checksum=81b8cbe1519cdb79bed04910dd6fa4e181faf8c88dff1e1b987b5f7ab23a5b1a
-
-post_install() {
-	vlicense LICENSE.txt LICENSE
-}
-
-python3-pyrfc3339_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3-pytz"
-	pycompile_module="pyrfc3339"
-	archs=noarch
-	pkg_install() {
-		vlicense LICENSE.txt LICENSE
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pyrfc3339 b/srcpkgs/python3-pyrfc3339
deleted file mode 120000
index 3d0f617bf62..00000000000
--- a/srcpkgs/python3-pyrfc3339
+++ /dev/null
@@ -1 +0,0 @@
-python-pyrfc3339
\ No newline at end of file
diff --git a/srcpkgs/python3-pyrfc3339/template b/srcpkgs/python3-pyrfc3339/template
new file mode 100644
index 00000000000..331c6c4c331
--- /dev/null
+++ b/srcpkgs/python3-pyrfc3339/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyrfc3339'
+pkgname=python3-pyrfc3339
+version=1.1
+revision=3
+wrksrc="pyRFC3339-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pytz"
+short_desc="Python3 library for generating and parsing RFC 3339 timestamps"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/kurtraschke/pyRFC3339"
+distfiles="${PYPI_SITE}/p/pyRFC3339/pyRFC3339-${version}.tar.gz"
+checksum=81b8cbe1519cdb79bed04910dd6fa4e181faf8c88dff1e1b987b5f7ab23a5b1a
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From 0aad6842feee704e7ae78032071e27b3cd7c497f 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 17:35:33 +0700
Subject: [PATCH 19/68] 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 6558f1a42f3caff4bc4bc1c822685e1aa53bf4df 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 17:37:00 +0700
Subject: [PATCH 20/68] python-pyperclip: drop package

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

diff --git a/srcpkgs/python3-pyperclip b/srcpkgs/python3-pyperclip
deleted file mode 120000
index ec52e733755..00000000000
--- a/srcpkgs/python3-pyperclip
+++ /dev/null
@@ -1 +0,0 @@
-python-pyperclip
\ No newline at end of file
diff --git a/srcpkgs/python-pyperclip/template b/srcpkgs/python3-pyperclip/template
similarity index 50%
rename from srcpkgs/python-pyperclip/template
rename to srcpkgs/python3-pyperclip/template
index 1286923b906..11e758320b9 100644
--- a/srcpkgs/python-pyperclip/template
+++ b/srcpkgs/python3-pyperclip/template
@@ -1,15 +1,14 @@
-# Template file for 'python-pyperclip'
-pkgname=python-pyperclip
+# Template file for 'python3-pyperclip'
+pkgname=python3-pyperclip
 version=1.8.0
-revision=1
-archs=noarch
+revision=2
 create_wrksrc=yes
 build_wrksrc=pyperclip-${version}
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Cross-platform clipboard module (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform clipboard module (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://pypi.org/project/pyperclip"
 distfiles="${PYPI_SITE}/p/pyperclip/pyperclip-${version}.tar.gz
@@ -20,12 +19,3 @@ checksum="b75b975160428d84608c26edba2dec146e7799566aea42c1fe1b32e72b6028f2
 post_install() {
 	vlicense ../LICENSE.txt
 }
-
-python3-pyperclip_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}

From b733c591cba33bcbb1951988cf38fa30ba7e6686 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 17:37:29 +0700
Subject: [PATCH 21/68] python-pypcapfile: drop package

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

diff --git a/srcpkgs/python-pypcapfile/template b/srcpkgs/python-pypcapfile/template
deleted file mode 100644
index 73b767f61c2..00000000000
--- a/srcpkgs/python-pypcapfile/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-pypcapfile'
-pkgname=python-pypcapfile
-version=0.12.0
-revision=1
-wrksrc="pypcapfile-${version}"
-archs=noarch
-build_style=python2-module
-pycompile_module="pcapfile"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="A Python library for handling libpcap savefiles"
-maintainer="cipr3s <cipr3s@gmx.com>"
-license="ISC"
-homepage="http://kisom.github.com/pypcapfile"
-distfiles="${PYPI_SITE}/p/pypcapfile/pypcapfile-${version}.tar.gz"
-checksum="3328e2136980468b0906bbe05a5a6e4e506a6f1a8451cf80393814c31e6f3b7f"
-
-post_install() {
-	$XBPS_FETCH_CMD https://raw.githubusercontent.com/kisom/pypcapfile/master/LICENSE
-	vlicense LICENSE
-}

From ebf68544170b60f12df0d23e0aa28be5e8e17eb0 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 17:37:59 +0700
Subject: [PATCH 22/68] python-pyotp: drop package

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

diff --git a/srcpkgs/python-pyotp/template b/srcpkgs/python-pyotp/template
deleted file mode 100644
index b70bd73d4aa..00000000000
--- a/srcpkgs/python-pyotp/template
+++ /dev/null
@@ -1,36 +0,0 @@
-# Template file for 'python-pyotp'
-pkgname=python-pyotp
-version=2.3.0
-revision=2
-archs=noarch
-wrksrc="pyotp-${version}"
-build_style=python-module
-pycompile_module="pyotp"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 One-Time Password Library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pyotp/pyotp"
-distfiles="${PYPI_SITE}/p/pyotp/pyotp-${version}.tar.gz"
-checksum=fc537e8acd985c5cbf51e11b7d53c42276fee017a73aec7c07380695671ca1a1
-
-do_check() {
-	python2 -B setup.py test
-	python3 -B setup.py test
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pyotp_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	archs=noarch
-	pycompile_module="pyotp"
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pyotp b/srcpkgs/python3-pyotp
deleted file mode 120000
index e125d108587..00000000000
--- a/srcpkgs/python3-pyotp
+++ /dev/null
@@ -1 +0,0 @@
-python-pyotp
\ No newline at end of file
diff --git a/srcpkgs/python3-pyotp/template b/srcpkgs/python3-pyotp/template
new file mode 100644
index 00000000000..91118a9c597
--- /dev/null
+++ b/srcpkgs/python3-pyotp/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-pyotp'
+pkgname=python3-pyotp
+version=2.3.0
+revision=3
+wrksrc="pyotp-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 One-Time Password Library"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pyotp/pyotp"
+distfiles="${PYPI_SITE}/p/pyotp/pyotp-${version}.tar.gz"
+checksum=fc537e8acd985c5cbf51e11b7d53c42276fee017a73aec7c07380695671ca1a1
+
+do_check() {
+	python3 -B setup.py test
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 5291657f3bc7f27be1a06ba1685645e30d587496 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 17:38:14 +0700
Subject: [PATCH 23/68] python-pykka: drop package

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

diff --git a/srcpkgs/python-pykka/template b/srcpkgs/python-pykka/template
deleted file mode 100644
index 512639c69c3..00000000000
--- a/srcpkgs/python-pykka/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-pykka'
-pkgname=python-pykka
-version=2.0.2
-revision=1
-archs=noarch
-wrksrc="Pykka-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the actor model"
-maintainer="allan <mail@may.mooo.com>"
-license="Apache-2.0"
-homepage="https://pypi.org/project/Pykka/"
-distfiles="${PYPI_SITE}/P/Pykka/Pykka-${version}.tar.gz"
-checksum=895cc2ed8779b65dd14a90ba3f4b8cb0f7904c7bf0710fe96a923019f8e82a39
-
-python3-pykka_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pykka b/srcpkgs/python3-pykka
deleted file mode 120000
index 06f11ba43a6..00000000000
--- a/srcpkgs/python3-pykka
+++ /dev/null
@@ -1 +0,0 @@
-python-pykka
\ No newline at end of file
diff --git a/srcpkgs/python3-pykka/template b/srcpkgs/python3-pykka/template
new file mode 100644
index 00000000000..d78fa350994
--- /dev/null
+++ b/srcpkgs/python3-pykka/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-pykka'
+pkgname=python3-pykka
+version=2.0.2
+revision=2
+wrksrc="Pykka-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the actor model"
+maintainer="allan <mail@may.mooo.com>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/Pykka/"
+distfiles="${PYPI_SITE}/P/Pykka/Pykka-${version}.tar.gz"
+checksum=895cc2ed8779b65dd14a90ba3f4b8cb0f7904c7bf0710fe96a923019f8e82a39

From 0f2f6cb703cbec583beb62205e32f364482633df 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 17:38:36 +0700
Subject: [PATCH 24/68] python-pyflakes: drop package

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

diff --git a/srcpkgs/python-pyflakes/template b/srcpkgs/python-pyflakes/template
deleted file mode 100644
index 586cba32b89..00000000000
--- a/srcpkgs/python-pyflakes/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyflakes'
-pkgname=python-pyflakes
-version=2.2.0
-revision=1
-archs=noarch
-wrksrc="pyflakes-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Passive checker of Python programs (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/PyCQA/pyflakes"
-distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
-checksum=35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8
-alternatives="pyflakes:pyflakes:/usr/bin/pyflakes2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pyflakes_package() {
-	archs=noarch
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="pyflakes:pyflakes:/usr/bin/pyflakes3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pyflakes b/srcpkgs/python3-pyflakes
deleted file mode 120000
index 5b70bae7b6a..00000000000
--- a/srcpkgs/python3-pyflakes
+++ /dev/null
@@ -1 +0,0 @@
-python-pyflakes
\ No newline at end of file
diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template
new file mode 100644
index 00000000000..67983857755
--- /dev/null
+++ b/srcpkgs/python3-pyflakes/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyflakes'
+pkgname=python3-pyflakes
+version=2.2.0
+revision=2
+wrksrc="pyflakes-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Passive checker of Python programs (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/PyCQA/pyflakes"
+distfiles="${PYPI_SITE}/p/pyflakes/pyflakes-${version}.tar.gz"
+checksum=35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8
+conflicts="python-pyflakes>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 8c8e80cff8ef091056a012000539d6507cc3caac 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 17:39:17 +0700
Subject: [PATCH 25/68] python-argon2: drop package

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

diff --git a/srcpkgs/python-argon2/template b/srcpkgs/python-argon2/template
deleted file mode 100644
index 646d5c2abec..00000000000
--- a/srcpkgs/python-argon2/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-argon2'
-pkgname=python-argon2
-version=19.2.0
-revision=1
-wrksrc="argon2-cffi-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
-makedepends="libargon2-devel python-devel python3-devel"
-depends="python-cffi python-enum34 python-six"
-short_desc="CFFI-based Argon2 Bindings for Python2"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="https://argon2-cffi.readthedocs.io/"
-changelog="https://raw.githubusercontent.com/hynek/argon2-cffi/master/CHANGELOG.rst"
-distfiles="https://github.com/hynek/argon2-cffi/archive/${version}.tar.gz"
-checksum=b7ad06a32aba8e795830c0248f8e6c464b7f3037442322937552a5e8b6013b7a
-
-export ARGON2_CFFI_USE_SYSTEM=1
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-argon2_package() {
-	depends="python3-cffi python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-argon2 b/srcpkgs/python3-argon2
deleted file mode 120000
index 01df5bf05a8..00000000000
--- a/srcpkgs/python3-argon2
+++ /dev/null
@@ -1 +0,0 @@
-python-argon2
\ No newline at end of file
diff --git a/srcpkgs/python3-argon2/template b/srcpkgs/python3-argon2/template
new file mode 100644
index 00000000000..37c99f12a82
--- /dev/null
+++ b/srcpkgs/python3-argon2/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-argon2'
+pkgname=python3-argon2
+version=19.2.0
+revision=1
+wrksrc="argon2-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-cffi"
+makedepends="libargon2-devel python3-devel"
+depends="python3-cffi python3-six"
+short_desc="CFFI-based Argon2 Bindings for Python3"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="https://argon2-cffi.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/hynek/argon2-cffi/master/CHANGELOG.rst"
+distfiles="https://github.com/hynek/argon2-cffi/archive/${version}.tar.gz"
+checksum=b7ad06a32aba8e795830c0248f8e6c464b7f3037442322937552a5e8b6013b7a
+
+export ARGON2_CFFI_USE_SYSTEM=1
+
+post_install() {
+	vlicense LICENSE
+}

From a0a70c7fe60a457be50937b98138ba3faa0d993d 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 17:39:44 +0700
Subject: [PATCH 26/68] 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 5fc440ddc2132a7eebebd28be50d5ca2b1360f8f 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 17:40:13 +0700
Subject: [PATCH 27/68] python-paramiko: drop package

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

diff --git a/srcpkgs/python-paramiko/template b/srcpkgs/python-paramiko/template
deleted file mode 100644
index f1bca0aea24..00000000000
--- a/srcpkgs/python-paramiko/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-paramiko'
-pkgname=python-paramiko
-version=2.7.1
-revision=1
-archs=noarch
-wrksrc="${pkgname/python-/}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-cryptography python-pyasn1 python-bcrypt python-pynacl"
-short_desc="Python2 SSH2 protocol library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="LGPL-2.1-or-later"
-homepage="http://www.paramiko.org/"
-distfiles="${PYPI_SITE}/p/paramiko/paramiko-${version}.tar.gz"
-checksum=920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f
-
-python3-paramiko_package() {
-	archs=noarch
-	depends="python3-cryptography python3-pyasn1 python3-bcrypt python3-pynacl"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-paramiko b/srcpkgs/python3-paramiko
deleted file mode 120000
index da80348ea4b..00000000000
--- a/srcpkgs/python3-paramiko
+++ /dev/null
@@ -1 +0,0 @@
-python-paramiko
\ No newline at end of file
diff --git a/srcpkgs/python3-paramiko/template b/srcpkgs/python3-paramiko/template
new file mode 100644
index 00000000000..125abe44fba
--- /dev/null
+++ b/srcpkgs/python3-paramiko/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-paramiko'
+pkgname=python3-paramiko
+version=2.7.1
+revision=2
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-cryptography python3-pyasn1 python3-bcrypt python3-pynacl"
+short_desc="Python3 SSH2 protocol library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="http://www.paramiko.org/"
+distfiles="${PYPI_SITE}/p/paramiko/paramiko-${version}.tar.gz"
+checksum=920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f

From 61ac85fd9b6547db70004b13fd66b986fc0bd11a 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 17:41:46 +0700
Subject: [PATCH 28/68] python-pynacl: drop package

---
 srcpkgs/python-pynacl/template  | 32 --------------------------------
 srcpkgs/python3-nacl            |  2 +-
 srcpkgs/python3-pynacl          |  1 -
 srcpkgs/python3-pynacl/template | 25 +++++++++++++++++++++++++
 4 files changed, 26 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/python-pynacl/template
 delete mode 120000 srcpkgs/python3-pynacl
 create mode 100644 srcpkgs/python3-pynacl/template

diff --git a/srcpkgs/python-pynacl/template b/srcpkgs/python-pynacl/template
deleted file mode 100644
index 6de29f2459f..00000000000
--- a/srcpkgs/python-pynacl/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pynacl'
-pkgname=python-pynacl
-version=1.3.0
-revision=4
-wrksrc="PyNaCl-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
-makedepends="python-devel python3-devel python-cffi python3-cffi libsodium-devel"
-depends="python-cffi python-six"
-checkdepends="${depends} python-hypothesis python-more-itertools python-parsing"
-short_desc="Python2 binding to the Networking and Cryptography (NaCl) library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/pyca/pynacl/"
-distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
-checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
-
-export SODIUM_INSTALL=system
-
-python3-pynacl_package() {
-	depends="python3-cffi python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
-
-python3-nacl_package() {
-	build_style=meta
-	depends="python3-pynacl"
-	short_desc="${short_desc/Python2/Python3} - dummy transitional package"
-}
diff --git a/srcpkgs/python3-nacl b/srcpkgs/python3-nacl
index 5738ec6f9cf..ffc889fd77b 120000
--- a/srcpkgs/python3-nacl
+++ b/srcpkgs/python3-nacl
@@ -1 +1 @@
-python-pynacl
\ No newline at end of file
+python3-pynacl
\ No newline at end of file
diff --git a/srcpkgs/python3-pynacl b/srcpkgs/python3-pynacl
deleted file mode 120000
index 5738ec6f9cf..00000000000
--- a/srcpkgs/python3-pynacl
+++ /dev/null
@@ -1 +0,0 @@
-python-pynacl
\ No newline at end of file
diff --git a/srcpkgs/python3-pynacl/template b/srcpkgs/python3-pynacl/template
new file mode 100644
index 00000000000..d78d92cfd69
--- /dev/null
+++ b/srcpkgs/python3-pynacl/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-pynacl'
+pkgname=python3-pynacl
+version=1.3.0
+revision=4
+wrksrc="PyNaCl-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-cffi"
+makedepends="python3-devel python3-cffi libsodium-devel"
+depends="python3-cffi python3-six"
+checkdepends="${depends}"
+short_desc="Python3 binding to the Networking and Cryptography (NaCl) library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/pyca/pynacl/"
+distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
+checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
+
+export SODIUM_INSTALL=system
+
+
+python3-nacl_package() {
+	build_style=meta
+	depends="python3-pynacl"
+	short_desc+=" - dummy transitional package"
+}

From 0e9b7562d2f44c5265699cf8a93fdc21a2529c99 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 19:29:34 +0700
Subject: [PATCH 29/68] pax-utils: check with python3-pyelftools

Run into failure with both Python 2 and 3 for this lddtree cmp:
-/usr/lib/libc.so
+/lib/lib.so

All other tests are succeed.
---
 srcpkgs/pax-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pax-utils/template b/srcpkgs/pax-utils/template
index 2bde458a3aa..e077c486a7b 100644
--- a/srcpkgs/pax-utils/template
+++ b/srcpkgs/pax-utils/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--with-caps"
 hostmakedepends="pkg-config"
 makedepends="libcap-devel"
-checkdepends="python-pyelftools"
+checkdepends="python3-pyelftools"
 short_desc="PaX aware and related utilities for ELF binaries"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"

From 28a4cefb522035fd6c0b109148756c1f7560da05 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 19:33:12 +0700
Subject: [PATCH 30/68] python-pycountry: drop package

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

diff --git a/srcpkgs/python-pycountry/template b/srcpkgs/python-pycountry/template
deleted file mode 100644
index c4a4c9cafbd..00000000000
--- a/srcpkgs/python-pycountry/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-pycountry'
-pkgname=python-pycountry
-version=19.8.18
-revision=1
-archs=noarch
-wrksrc="pycountry-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="ISO databases accessible from Python2"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="LGPL-2.1-or-later"
-homepage="https://pypi.org/project/pycountry/"
-distfiles="${PYPI_SITE}/p/pycountry/pycountry-${version}.tar.gz"
-checksum=3c57aa40adcf293d59bebaffbe60d8c39976fba78d846a018dc0c2ec9c6cb3cb
-
-python3-pycountry_package() {
-	archs=noarch
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pycountry b/srcpkgs/python3-pycountry
deleted file mode 120000
index ef105cd19c0..00000000000
--- a/srcpkgs/python3-pycountry
+++ /dev/null
@@ -1 +0,0 @@
-python-pycountry
\ No newline at end of file
diff --git a/srcpkgs/python3-pycountry/template b/srcpkgs/python3-pycountry/template
new file mode 100644
index 00000000000..1a4ce3b65f2
--- /dev/null
+++ b/srcpkgs/python3-pycountry/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-pycountry'
+pkgname=python3-pycountry
+version=19.8.18
+revision=2
+wrksrc="pycountry-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="ISO databases accessible from Python3"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+license="LGPL-2.1-or-later"
+homepage="https://pypi.org/project/pycountry/"
+distfiles="${PYPI_SITE}/p/pycountry/pycountry-${version}.tar.gz"
+checksum=3c57aa40adcf293d59bebaffbe60d8c39976fba78d846a018dc0c2ec9c6cb3cb

From 3178e227e28ad16573083135edb05a92c0403af5 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 19:35:29 +0700
Subject: [PATCH 31/68] python-ldap3: drop package

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

diff --git a/srcpkgs/python-ldap3/template b/srcpkgs/python-ldap3/template
deleted file mode 100644
index 39fcc264979..00000000000
--- a/srcpkgs/python-ldap3/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-ldap3'
-pkgname=python-ldap3
-version=2.6.1
-revision=2
-archs=noarch
-wrksrc="ldap3-${version}"
-build_style=python-module
-pycompile_module="ldap3"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-pyasn1"
-short_desc="Strictly RFC 4510 conforming LDAP V3 pure Python client (Python2)"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/cannatag/ldap3"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f21d1a65e19ed5a691d7cf30af375e84663254e800ddc950bd7b6f9bb15d2c19
-
-python3-ldap3_package() {
-	archs=noarch
-	depends="python3-pyasn1"
-	pycompile_module="ldap3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-	}
-}
diff --git a/srcpkgs/python3-ldap3 b/srcpkgs/python3-ldap3
deleted file mode 120000
index 2efd71661a1..00000000000
--- a/srcpkgs/python3-ldap3
+++ /dev/null
@@ -1 +0,0 @@
-python-ldap3
\ No newline at end of file
diff --git a/srcpkgs/python3-ldap3/template b/srcpkgs/python3-ldap3/template
new file mode 100644
index 00000000000..c1cabd083da
--- /dev/null
+++ b/srcpkgs/python3-ldap3/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ldap3'
+pkgname=python3-ldap3
+version=2.6.1
+revision=3
+wrksrc="ldap3-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-pyasn1"
+short_desc="Strictly RFC 4510 conforming LDAP V3 pure Python client (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/cannatag/ldap3"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=f21d1a65e19ed5a691d7cf30af375e84663254e800ddc950bd7b6f9bb15d2c19

From 2d8900e38e01c1b648e10f9a54f7df89e90553d8 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 19:36:17 +0700
Subject: [PATCH 32/68] python-ldap: drop package

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

diff --git a/srcpkgs/python-ldap/template b/srcpkgs/python-ldap/template
deleted file mode 100644
index e3efc2fc6b3..00000000000
--- a/srcpkgs/python-ldap/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-ldap'
-pkgname=python-ldap
-version=3.2.0
-revision=2
-build_style=python-module
-pycompile_module="ldap ldapurl.py ldif.py slapdtest"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel libldap-devel"
-depends="python-pyasn1-modules"
-checkdepends="openldap openldap-tools"
-short_desc="Python2 modules for implementing LDAP clients"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="Python-2.0"
-homepage="https://www.python-ldap.org"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e
-
-pre_build() {
-	sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg
-}
-
-python3-ldap_package() {
-	depends="python3-pyasn1-modules"
-	short_desc="${short_desc/Python2/Python3}"
-	pycompile_module="ldap ldapurl.py ldif.py slapdtest"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-ldap b/srcpkgs/python3-ldap
deleted file mode 120000
index ec04072ef06..00000000000
--- a/srcpkgs/python3-ldap
+++ /dev/null
@@ -1 +0,0 @@
-python-ldap
\ No newline at end of file
diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template
new file mode 100644
index 00000000000..90d9650d89c
--- /dev/null
+++ b/srcpkgs/python3-ldap/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-ldap'
+pkgname=python3-ldap
+_pkgname=python-ldap
+version=3.2.0
+revision=2
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libldap-devel"
+depends="python3-pyasn1-modules"
+checkdepends="openldap openldap-tools"
+short_desc="Python3 modules for implementing LDAP clients"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="Python-2.0"
+homepage="https://www.python-ldap.org"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=7d1c4b15375a533564aad3d3deade789221e450052b21ebb9720fb822eccdb8e
+
+pre_build() {
+	sed -i "s:^libs = .*:libs = ldap_r lber sasl2 ssl crypto:" setup.cfg
+}
diff --git a/srcpkgs/python-ldap/update b/srcpkgs/python3-ldap/update
similarity index 100%
rename from srcpkgs/python-ldap/update
rename to srcpkgs/python3-ldap/update

From dd9a5bf1f6df01f43a4daaad6c99d4389ef4666c 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 19:36:52 +0700
Subject: [PATCH 33/68] 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 d08bcd3c45adfa9a9096fe0bd71d47439f845806 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 19:37:16 +0700
Subject: [PATCH 34/68] python-pyPEG2: drop package

---
 srcpkgs/python-pyPEG2/template  | 27 ---------------------------
 srcpkgs/python3-pyPEG2          |  1 -
 srcpkgs/python3-pyPEG2/template | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/python-pyPEG2/template
 delete mode 120000 srcpkgs/python3-pyPEG2
 create mode 100644 srcpkgs/python3-pyPEG2/template

diff --git a/srcpkgs/python-pyPEG2/template b/srcpkgs/python-pyPEG2/template
deleted file mode 100644
index e9a10e88c15..00000000000
--- a/srcpkgs/python-pyPEG2/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-pyPEG2'
-pkgname=python-pyPEG2
-version=2.15.2
-revision=5
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="python-lxml"
-pycompile_module="pypeg2"
-short_desc="An intrinsic PEG Parser-Interpreter for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://fdik.org/pyPEG/"
-distfiles="${PYPI_SITE}/p/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=2b2d4f80d8e1a9370b2a91f4a25f4abf7f69b85c8da84cd23ec36451958a1f6d
-
-python3-pyPEG2_package() {
-	archs=noarch
-	depends="python3-lxml"
-	pycompile_module="pypeg2"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pyPEG2 b/srcpkgs/python3-pyPEG2
deleted file mode 120000
index 54085c6f53d..00000000000
--- a/srcpkgs/python3-pyPEG2
+++ /dev/null
@@ -1 +0,0 @@
-python-pyPEG2
\ No newline at end of file
diff --git a/srcpkgs/python3-pyPEG2/template b/srcpkgs/python3-pyPEG2/template
new file mode 100644
index 00000000000..4dc0e88f21a
--- /dev/null
+++ b/srcpkgs/python3-pyPEG2/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pyPEG2'
+pkgname=python3-pyPEG2
+version=2.15.2
+revision=6
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-lxml"
+short_desc="Intrinsic PEG Parser-Interpreter for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
+homepage="http://fdik.org/pyPEG/"
+distfiles="${PYPI_SITE}/p/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
+checksum=2b2d4f80d8e1a9370b2a91f4a25f4abf7f69b85c8da84cd23ec36451958a1f6d

From 295ae6966bd1c7e3cfe67ef78cc6c80697685e2f 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 19:50:46 +0700
Subject: [PATCH 35/68] dpdk: build with python 3

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

diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 30a7e6b5f5c..69867609507 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,7 +1,7 @@
 # Template file for 'dpdk'
 pkgname=dpdk
 version=19.08
-revision=3
+revision=4
 # no musl - uses error.h, execinfo.h and argp.h
 archs="x86_64 aarch64 ppc64le i686 armv7l"
 build_style=meson
@@ -9,14 +9,15 @@ configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
 hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
 makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
  zlib-devel libressl-devel libbsd-devel libelf libmnl"
-depends="python-pyelftools"
+depends="python3-pyelftools"
 short_desc="Data Plane Development Kit"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause, GPL-2.0-only"
 homepage="https://www.dpdk.org/"
 distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
 checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
-python_version=2 #unverified
+# import py3compat
+python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in
 	armv7l*) configure_args+=" -Dmachine=armv7-a";;
@@ -30,12 +31,10 @@ CFLAGS="-fcommon"
 post_install() {
 	vmkdir usr/lib/modules-load.d
 	vlicense license/bsd-3-clause.txt
-	vlicense license/gpl-2.0.txt
 }
 
 dpdk-doc_package() {
 	short_desc+=" - documentation"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/doc
 	}

From 9b28b02d9f91e5de46e7daf38180e1c97ab1896e 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 19:53:49 +0700
Subject: [PATCH 36/68] python-pexpect: drop package

---
 srcpkgs/python-pexpect/template  | 41 --------------------------------
 srcpkgs/python3-pexpect          |  1 -
 srcpkgs/python3-pexpect/template | 28 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/python-pexpect/template
 delete mode 120000 srcpkgs/python3-pexpect
 create mode 100644 srcpkgs/python3-pexpect/template

diff --git a/srcpkgs/python-pexpect/template b/srcpkgs/python-pexpect/template
deleted file mode 100644
index 03102c3d294..00000000000
--- a/srcpkgs/python-pexpect/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'python-pexpect'
-pkgname=python-pexpect
-version=4.7.0
-revision=2
-archs=noarch
-wrksrc="pexpect-${version}"
-build_style=python-module
-pycompile_module="pexpect"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-ptyprocess"
-checkdepends="python3-pytest python3-ptyprocess mdocml"
-short_desc="Python2 module for spawning child applications and controlling them"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="ISC"
-homepage="https://pexpect.readthedocs.io/"
-distfiles="${PYPI_SITE}/p/pexpect/pexpect-${version}.tar.gz"
-checksum=9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb
-
-do_check() {
-	# the mdcocml is for test
-	# REPLWrapTestCase.test_pager_as_cat
-	python3 -m pytest
-}
-
-post_install() {
-	# drop asyncio stuff from python2
-	# https://github.com/pexpect/pexpect/issues/290
-	rm -f ${DESTDIR}/usr/lib/python2*/site-packages/pexpect/_async.py
-	vlicense LICENSE
-}
-
-python3-pexpect_package() {
-	archs=noarch
-	depends="python3-ptyprocess"
-	pycompile_module="pexpect"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pexpect b/srcpkgs/python3-pexpect
deleted file mode 120000
index 1ad8b9136c4..00000000000
--- a/srcpkgs/python3-pexpect
+++ /dev/null
@@ -1 +0,0 @@
-python-pexpect
\ No newline at end of file
diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template
new file mode 100644
index 00000000000..44eb0c15f6b
--- /dev/null
+++ b/srcpkgs/python3-pexpect/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-pexpect'
+pkgname=python3-pexpect
+version=4.7.0
+revision=3
+wrksrc="pexpect-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ptyprocess"
+checkdepends="python3-pytest python3-ptyprocess mdocml"
+short_desc="Python3 module for spawning child applications and controlling them"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="https://pexpect.readthedocs.io/"
+distfiles="${PYPI_SITE}/p/pexpect/pexpect-${version}.tar.gz"
+checksum=9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb
+
+do_check() {
+	# the mdcocml is for test
+	# REPLWrapTestCase.test_pager_as_cat
+	python3 -m pytest
+}
+
+post_install() {
+	# drop asyncio stuff from python2
+	# https://github.com/pexpect/pexpect/issues/290
+	rm -f ${DESTDIR}/usr/lib/python3*/site-packages/pexpect/_async.py
+	vlicense LICENSE
+}

From 261b4ff86ee951a6bebcf2f518e73fb8e0b71876 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 19:56:07 +0700
Subject: [PATCH 37/68] python-ptyprocess: drop package

---
 srcpkgs/python-ptyprocess/template  | 31 -----------------------------
 srcpkgs/python3-pexpect/template    |  2 +-
 srcpkgs/python3-ptyprocess          |  1 -
 srcpkgs/python3-ptyprocess/template | 18 +++++++++++++++++
 4 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/python-ptyprocess/template
 delete mode 120000 srcpkgs/python3-ptyprocess
 create mode 100644 srcpkgs/python3-ptyprocess/template

diff --git a/srcpkgs/python-ptyprocess/template b/srcpkgs/python-ptyprocess/template
deleted file mode 100644
index fd2e51fa3ac..00000000000
--- a/srcpkgs/python-ptyprocess/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-ptyprocess'
-pkgname=python-ptyprocess
-version=0.6.0
-revision=2
-archs=noarch
-wrksrc="ptyprocess-${version}"
-build_style=python-module
-pycompile_module="ptyprocess"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Run a subprocess in a pseudo terminal (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pexpect/ptyprocess"
-license="ISC"
-distfiles="${PYPI_SITE}/p/ptyprocess/ptyprocess-${version}.tar.gz"
-checksum=923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-ptyprocess_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="ptyprocess"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template
index 44eb0c15f6b..0d6548021c2 100644
--- a/srcpkgs/python3-pexpect/template
+++ b/srcpkgs/python3-pexpect/template
@@ -23,6 +23,6 @@ do_check() {
 post_install() {
 	# drop asyncio stuff from python2
 	# https://github.com/pexpect/pexpect/issues/290
-	rm -f ${DESTDIR}/usr/lib/python3*/site-packages/pexpect/_async.py
+	rm -f ${DESTDIR}/usr/lib/python$py3_ver/site-packages/pexpect/_async.py
 	vlicense LICENSE
 }
diff --git a/srcpkgs/python3-ptyprocess b/srcpkgs/python3-ptyprocess
deleted file mode 120000
index 08451da4e8b..00000000000
--- a/srcpkgs/python3-ptyprocess
+++ /dev/null
@@ -1 +0,0 @@
-python-ptyprocess
\ No newline at end of file
diff --git a/srcpkgs/python3-ptyprocess/template b/srcpkgs/python3-ptyprocess/template
new file mode 100644
index 00000000000..b6d93378e7d
--- /dev/null
+++ b/srcpkgs/python3-ptyprocess/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-ptyprocess'
+pkgname=python3-ptyprocess
+version=0.6.0
+revision=3
+wrksrc="ptyprocess-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Run a subprocess in a pseudo terminal (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="https://github.com/pexpect/ptyprocess"
+distfiles="${PYPI_SITE}/p/ptyprocess/ptyprocess-${version}.tar.gz"
+checksum=923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0
+
+post_install() {
+	vlicense LICENSE
+}

From cb659b950fe6b016b91748e0f1a2b990e438bafe 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 19:56:30 +0700
Subject: [PATCH 38/68] python-proselint: drop package

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

diff --git a/srcpkgs/python-proselint/template b/srcpkgs/python-proselint/template
deleted file mode 100644
index b1da90de474..00000000000
--- a/srcpkgs/python-proselint/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-proselint'
-pkgname=python-proselint
-version=0.10.2
-revision=2
-archs=noarch
-wrksrc="proselint-${version}"
-build_style=python-module
-pycompile_module="proselint"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools python-click python-future python-six"
-short_desc="Linter for prose (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="BSD-3-Clause"
-homepage="https://github.com/amperser/proselint"
-changelog="https://raw.githubusercontent.com/amperser/proselint/master/CHANGELOG.md"
-distfiles="${PYPI_SITE}/p/proselint/proselint-${version}.tar.gz"
-checksum=3a87eb393056d1bc77d898e4bcf8998f50e9ad84f7b9ff7cf2720509ac8ef904
-alternatives="proselint:proselint:/usr/bin/proselint2"
-
-post_install() {
-	vlicense LICENSE.md
-	# remove tests directory polluting site-packages
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests
-}
-
-python3-proselint_package() {
-	archs=noarch
-	depends="python3-setuptools python3-click python3-future python3-six"
-	pycompile_module="proselint"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="proselint:proselint:/usr/bin/proselint3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE.md
-	}
-}
diff --git a/srcpkgs/python3-proselint b/srcpkgs/python3-proselint
deleted file mode 120000
index 2221b13aa84..00000000000
--- a/srcpkgs/python3-proselint
+++ /dev/null
@@ -1 +0,0 @@
-python-proselint
\ No newline at end of file
diff --git a/srcpkgs/python3-proselint/template b/srcpkgs/python3-proselint/template
new file mode 100644
index 00000000000..54af756372c
--- /dev/null
+++ b/srcpkgs/python3-proselint/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-proselint'
+pkgname=python3-proselint
+version=0.10.2
+revision=3
+wrksrc="proselint-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-click python3-future python3-six"
+short_desc="Linter for prose (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="BSD-3-Clause"
+homepage="https://github.com/amperser/proselint"
+changelog="https://raw.githubusercontent.com/amperser/proselint/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/p/proselint/proselint-${version}.tar.gz"
+checksum=3a87eb393056d1bc77d898e4bcf8998f50e9ad84f7b9ff7cf2720509ac8ef904
+conflicts="python-proselint>=0"
+
+post_install() {
+	vlicense LICENSE.md
+	# remove tests directory polluting site-packages
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/tests
+}

From 9d0045c2fcbcaf9127b2d6816554667fcc22116c 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 19:58:07 +0700
Subject: [PATCH 39/68] python-prompt_toolkit2: drop package

---
 srcpkgs/python-prompt_toolkit2/INSTALL.msg         |  2 --
 .../python3-prompt_toolkit2.INSTALL.msg            |  2 --
 srcpkgs/python-prompt_toolkit2/template            | 14 --------------
 srcpkgs/python3-prompt_toolkit2                    |  1 -
 4 files changed, 19 deletions(-)
 delete mode 100644 srcpkgs/python-prompt_toolkit2/INSTALL.msg
 delete mode 100644 srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
 delete mode 100644 srcpkgs/python-prompt_toolkit2/template
 delete mode 120000 srcpkgs/python3-prompt_toolkit2

diff --git a/srcpkgs/python-prompt_toolkit2/INSTALL.msg b/srcpkgs/python-prompt_toolkit2/INSTALL.msg
deleted file mode 100644
index a9fa64cb158..00000000000
--- a/srcpkgs/python-prompt_toolkit2/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg b/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
deleted file mode 100644
index c836027cd34..00000000000
--- a/srcpkgs/python-prompt_toolkit2/python3-prompt_toolkit2.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python3-prompt_toolkit2 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit2/template b/srcpkgs/python-prompt_toolkit2/template
deleted file mode 100644
index e0f00f41668..00000000000
--- a/srcpkgs/python-prompt_toolkit2/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-prompt_toolkit2'
-pkgname=python-prompt_toolkit2
-version=2.0.9
-revision=5
-archs=noarch
-build_style=meta
-short_desc="Python2 library for building command lines (removed package)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="metapackage"
-homepage="https://github.com/jonathanslenders/python-prompt-toolkit"
-
-python3-prompt_toolkit2_package() {
-	short_desc="${short_desc/Python2/Python3}"
-}
diff --git a/srcpkgs/python3-prompt_toolkit2 b/srcpkgs/python3-prompt_toolkit2
deleted file mode 120000
index 19eb86261ee..00000000000
--- a/srcpkgs/python3-prompt_toolkit2
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit2
\ No newline at end of file

From 3d89f82a796aeee8b03028ae81a59550fcbd8513 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 20:41:41 +0700
Subject: [PATCH 40/68] python-prometheus_client: drop package

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

diff --git a/srcpkgs/python-prometheus_client/template b/srcpkgs/python-prometheus_client/template
deleted file mode 100644
index 7b71fbeffc2..00000000000
--- a/srcpkgs/python-prometheus_client/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-prometheus_client'
-pkgname=python-prometheus_client
-version=0.7.1
-revision=2
-archs=noarch
-wrksrc="prometheus_client-${version}"
-build_style=python-module
-pycompile_module="prometheus_client"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 client for the Prometheus monitoring system"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/prometheus/client_python"
-distfiles="${PYPI_SITE}/p/prometheus_client/prometheus_client-${version}.tar.gz"
-checksum=71cd24a2b3eb335cb800c7159f423df1bd4dcd5171b234be15e3f31ec9f622da
-
-python3-prometheus_client_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="prometheus_client"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-prometheus_client b/srcpkgs/python3-prometheus_client
deleted file mode 120000
index fd9bb1adaa6..00000000000
--- a/srcpkgs/python3-prometheus_client
+++ /dev/null
@@ -1 +0,0 @@
-python-prometheus_client
\ No newline at end of file
diff --git a/srcpkgs/python3-prometheus_client/template b/srcpkgs/python3-prometheus_client/template
new file mode 100644
index 00000000000..b69a3d1f297
--- /dev/null
+++ b/srcpkgs/python3-prometheus_client/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-prometheus_client'
+pkgname=python3-prometheus_client
+version=0.7.1
+revision=3
+wrksrc="prometheus_client-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 client for the Prometheus monitoring system"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/prometheus/client_python"
+distfiles="${PYPI_SITE}/p/prometheus_client/prometheus_client-${version}.tar.gz"
+checksum=71cd24a2b3eb335cb800c7159f423df1bd4dcd5171b234be15e3f31ec9f622da

From 07d0bf1d6189832d67a49f165736734d762c7a34 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 20:42:02 +0700
Subject: [PATCH 41/68] python-progress: drop package

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

diff --git a/srcpkgs/python-progress/template b/srcpkgs/python-progress/template
deleted file mode 100644
index 0d6bd1db69d..00000000000
--- a/srcpkgs/python-progress/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-progress'
-pkgname=python-progress
-version=1.5
-revision=2
-archs=noarch
-wrksrc="progress-${version}"
-build_style=python-module
-pycompile_module="progress"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Easy to use progress bars (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="ISC"
-homepage="https://github.com/verigak/progress"
-distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz"
-checksum=69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-progress_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="progress"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-progress b/srcpkgs/python3-progress
deleted file mode 120000
index e792df4a562..00000000000
--- a/srcpkgs/python3-progress
+++ /dev/null
@@ -1 +0,0 @@
-python-progress
\ No newline at end of file
diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template
new file mode 100644
index 00000000000..35cff7a258f
--- /dev/null
+++ b/srcpkgs/python3-progress/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-progress'
+pkgname=python3-progress
+version=1.5
+revision=3
+wrksrc="progress-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Easy to use progress bars (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="ISC"
+homepage="https://github.com/verigak/progress"
+distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz"
+checksum=69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372
+
+post_install() {
+	vlicense LICENSE
+}

From e4e0405c601ffff8c4f23caef1193697196eaa01 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 20:42:33 +0700
Subject: [PATCH 42/68] python-polib: drop package

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

diff --git a/srcpkgs/python-polib/template b/srcpkgs/python-polib/template
deleted file mode 100644
index 8b8d4b66c68..00000000000
--- a/srcpkgs/python-polib/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'python-polib'
-pkgname=python-polib
-version=1.1.0
-revision=2
-archs=noarch
-wrksrc="polib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-pycompile_module="polib.py"
-short_desc="Python2 library to manipulate gettext files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://bitbucket.org/izi/polib/"
-license="MIT"
-distfiles="${PYPI_SITE}/p/polib/polib-${version}.tar.gz"
-checksum=fad87d13696127ffb27ea0882d6182f1a9cf8a5e2b37a587751166c51e5a332a
-
-do_check() {
-	./runtests.sh
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-polib_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="polib.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-polib b/srcpkgs/python3-polib
deleted file mode 120000
index 3401b268c46..00000000000
--- a/srcpkgs/python3-polib
+++ /dev/null
@@ -1 +0,0 @@
-python-polib
\ No newline at end of file
diff --git a/srcpkgs/python3-polib/template b/srcpkgs/python3-polib/template
new file mode 100644
index 00000000000..a4ca2d745fa
--- /dev/null
+++ b/srcpkgs/python3-polib/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-polib'
+pkgname=python3-polib
+version=1.1.0
+revision=3
+wrksrc="polib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library to manipulate gettext files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="http://bitbucket.org/izi/polib/"
+distfiles="${PYPI_SITE}/p/polib/polib-${version}.tar.gz"
+checksum=fad87d13696127ffb27ea0882d6182f1a9cf8a5e2b37a587751166c51e5a332a
+
+do_check() {
+	./runtests.sh
+}
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python-polib/update b/srcpkgs/python3-polib/update
similarity index 100%
rename from srcpkgs/python-polib/update
rename to srcpkgs/python3-polib/update

From d888deb44a53eddc8a8723e60f8de8542ef689a9 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 20:43:00 +0700
Subject: [PATCH 43/68] python-podcastparser: drop package

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

diff --git a/srcpkgs/python-podcastparser/template b/srcpkgs/python-podcastparser/template
deleted file mode 100644
index 58fd20d3f73..00000000000
--- a/srcpkgs/python-podcastparser/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-podcastparser'
-pkgname=python-podcastparser
-version=0.6.5
-revision=1
-archs=noarch
-wrksrc="podcastparser-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-depends="python"
-checkdepends="python3-nose python3-coverage"
-short_desc="Simplified, fast RSS parsing library (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="ISC"
-homepage="https://github.com/gpodder/podcastparser"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=4f97dde70ce2ab775f66c0feb94f26b6e52b40a67f717cd465140d4c0896177a
-
-do_check() {
-	nosetests3 -v
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-podcastparser_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	archs=noarch
-	depends="python3"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-podcastparser b/srcpkgs/python3-podcastparser
deleted file mode 120000
index b517fc3a3b2..00000000000
--- a/srcpkgs/python3-podcastparser
+++ /dev/null
@@ -1 +0,0 @@
-python-podcastparser
\ No newline at end of file
diff --git a/srcpkgs/python3-podcastparser/template b/srcpkgs/python3-podcastparser/template
new file mode 100644
index 00000000000..4a180bb349b
--- /dev/null
+++ b/srcpkgs/python3-podcastparser/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-podcastparser'
+pkgname=python3-podcastparser
+version=0.6.5
+revision=2
+wrksrc="podcastparser-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel"
+depends="python3"
+checkdepends="python3-nose python3-coverage"
+short_desc="Simplified, fast RSS parsing library (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="ISC"
+homepage="https://github.com/gpodder/podcastparser"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=4f97dde70ce2ab775f66c0feb94f26b6e52b40a67f717cd465140d4c0896177a
+
+do_check() {
+	nosetests3 -v
+}
+
+post_install() {
+	vlicense LICENSE
+}

From df3c1997580f944291963cf88c73882f9b737c06 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 20:43:55 +0700
Subject: [PATCH 44/68] python3-lz4: depends on python3

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

diff --git a/srcpkgs/python3-lz4 b/srcpkgs/python3-lz4
deleted file mode 120000
index 858a976b46a..00000000000
--- a/srcpkgs/python3-lz4
+++ /dev/null
@@ -1 +0,0 @@
-python-lz4
\ No newline at end of file
diff --git a/srcpkgs/python-lz4/template b/srcpkgs/python3-lz4/template
similarity index 55%
rename from srcpkgs/python-lz4/template
rename to srcpkgs/python3-lz4/template
index 76a2e800e38..29edfbcd8b0 100644
--- a/srcpkgs/python-lz4/template
+++ b/srcpkgs/python3-lz4/template
@@ -1,16 +1,14 @@
-# Template file for 'python-lz4'
-pkgname=python-lz4
+# Template file for 'python3-lz4'
+pkgname=python3-lz4
 version=2.1.6
-revision=3
+revision=4
 wrksrc="lz4-${version}"
-build_style=python-module
-pycompile_module="lz4"
-hostmakedepends="pkg-config python-setuptools python3-setuptools
- python-pkgconfig python3-pkgconfig"
-makedepends="python-devel python3-devel liblz4-devel"
-depends="python-future"
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools python3-pkgconfig"
+makedepends="python3-devel liblz4-devel"
+depends="python3"
 checkdepends="python3-pytest python3-psutil"
-short_desc="LZ4 bindings for Python2"
+short_desc="LZ4 bindings for Python3"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="BSD-3-Clause"
 homepage="https://github.com/python-lz4/python-lz4"
@@ -33,12 +31,3 @@ do_check() {
 post_install() {
 	vlicense LICENSE
 }
-
-python3-lz4_package() {
-	pycompile_module="lz4"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}

From e9dc7b108f2ec43b2b7b35415d2a3edc920b861a 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 20:45:56 +0700
Subject: [PATCH 45/68] python-pkgconfig: drop package

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

diff --git a/srcpkgs/python-pkgconfig/template b/srcpkgs/python-pkgconfig/template
deleted file mode 100644
index e9e5480907d..00000000000
--- a/srcpkgs/python-pkgconfig/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pkgconfig'
-pkgname=python-pkgconfig
-version=1.5.1
-revision=2
-archs=noarch
-wrksrc="pkgconfig-${version}"
-build_style=python-module
-pycompile_module="pkgconfig"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 module to interface with pkg-config"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/matze/pkgconfig"
-distfiles="${PYPI_SITE}/p/pkgconfig/pkgconfig-${version}.tar.gz"
-checksum=97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pkgconfig_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="pkgconfig"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pkgconfig b/srcpkgs/python3-pkgconfig
deleted file mode 120000
index 9b18703342b..00000000000
--- a/srcpkgs/python3-pkgconfig
+++ /dev/null
@@ -1 +0,0 @@
-python-pkgconfig
\ No newline at end of file
diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template
new file mode 100644
index 00000000000..e150a3b31db
--- /dev/null
+++ b/srcpkgs/python3-pkgconfig/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pkgconfig'
+pkgname=python3-pkgconfig
+version=1.5.1
+revision=3
+wrksrc="pkgconfig-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 module to interface with pkg-config"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/matze/pkgconfig"
+distfiles="${PYPI_SITE}/p/pkgconfig/pkgconfig-${version}.tar.gz"
+checksum=97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f
+
+post_install() {
+	vlicense LICENSE
+}

From 72b5b38ef8f8bcc5f2882f5b1c22d460f9f20abe 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 20:47:11 +0700
Subject: [PATCH 46/68] python-pipenv: drop package

---
 srcpkgs/python-pipenv/template  | 49 ---------------------------------
 srcpkgs/python3-pipenv          |  1 -
 srcpkgs/python3-pipenv/template | 26 +++++++++++++++++
 3 files changed, 26 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/python-pipenv/template
 delete mode 120000 srcpkgs/python3-pipenv
 create mode 100644 srcpkgs/python3-pipenv/template

diff --git a/srcpkgs/python-pipenv/template b/srcpkgs/python-pipenv/template
deleted file mode 100644
index 69490a04324..00000000000
--- a/srcpkgs/python-pipenv/template
+++ /dev/null
@@ -1,49 +0,0 @@
-# Template file for 'python-pipenv'
-pkgname=python-pipenv
-version=2020.8.13
-revision=1
-archs=noarch
-wrksrc="pipenv-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-pip python-virtualenv python-virtualenv-clone"
-short_desc="Python Development Workflow for Humans"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="MIT"
-homepage="https://github.com/pypa/pipenv"
-distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035
-alternatives="
- pipenv:pipenv:/usr/bin/pipenv2
- pipenv:pipenv-resolver:/usr/bin/pipenv-resolver2
-"
-
-post_extract() {
-	sed -i '/certifi/d' setup.py
-}
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/lib/python2*/site-packages/pipenv/patched/yaml3
-	vlicense LICENSE
-	# remove files only valid for Python 3
-	rm -f ${DESTDIR}/${py2_sitelib}/pipenv/vendor/importlib_resources/_py3.py
-	rm -f ${DESTDIR}/${py2_sitelib}/pipenv/vendor/jinja2/asyncsupport.py
-	rm -f ${DESTDIR}/${py2_sitelib}/pipenv/vendor/jinja2/asyncfilters.py
-	rm -f ${DESTDIR}/${py2_sitelib}/pipenv/vendor/pexpect/_async.py
-}
-
-python3-pipenv_package() {
-	archs=noarch
-	depends="python3 python3-pip python3-virtualenv python3-virtualenv-clone"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="
-	 pipenv:pipenv:/usr/bin/pipenv3
-	 pipenv:pipenv-resolver:/usr/bin/pipenv-resolver3
-	"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		rm -rf ${PKGDESTDIR}/usr/lib/python3*/site-packages/pipenv/patched/yaml2
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pipenv b/srcpkgs/python3-pipenv
deleted file mode 120000
index d6f33a0fb33..00000000000
--- a/srcpkgs/python3-pipenv
+++ /dev/null
@@ -1 +0,0 @@
-python-pipenv
\ No newline at end of file
diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
new file mode 100644
index 00000000000..cb295b593a8
--- /dev/null
+++ b/srcpkgs/python3-pipenv/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-pipenv'
+pkgname=python3-pipenv
+version=2020.8.13
+revision=2
+wrksrc="pipenv-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-pip python3-virtualenv python3-virtualenv-clone"
+short_desc="Python Development Workflow for Humans"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://github.com/pypa/pipenv"
+distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
+checksum=eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035
+conflicts="python-pipenv>=0"
+
+post_extract() {
+	sed -i '/certifi/d' setup.py
+}
+
+post_install() {
+	vlicense LICENSE
+	# remove files only valid for Python 2
+	rm -rf ${DESTDIR}/${py3_sitelib}/pipenv/patched/yaml2
+	rm -f ${DESTDIR}/${py3_sitelib}/pipenv/vendor/importlib_resources/_py2.py
+}

From 60dd017d3cea6ee742e2c38a2d2ab1ba3b1886ba 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 20:55:26 +0700
Subject: [PATCH 47/68] python-pickleshare: drop package

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

diff --git a/srcpkgs/python-pickleshare/template b/srcpkgs/python-pickleshare/template
deleted file mode 100644
index c1d86826c15..00000000000
--- a/srcpkgs/python-pickleshare/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pickleshare'
-pkgname=python-pickleshare
-version=0.7.5
-revision=2
-archs=noarch
-wrksrc="pickleshare-${version}"
-build_style=python-module
-pycompile_module="pickleshare.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-pathlib2"
-short_desc="Small shelve-like datastore with concurrency support (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pickleshare/pickleshare"
-license="MIT"
-distfiles="${PYPI_SITE}/p/pickleshare/pickleshare-${version}.tar.gz"
-checksum=87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pickleshare_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="pickleshare.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pickleshare b/srcpkgs/python3-pickleshare
deleted file mode 120000
index 574b3a08769..00000000000
--- a/srcpkgs/python3-pickleshare
+++ /dev/null
@@ -1 +0,0 @@
-python-pickleshare
\ No newline at end of file
diff --git a/srcpkgs/python3-pickleshare/template b/srcpkgs/python3-pickleshare/template
new file mode 100644
index 00000000000..86a09d0b562
--- /dev/null
+++ b/srcpkgs/python3-pickleshare/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pickleshare'
+pkgname=python3-pickleshare
+version=0.7.5
+revision=3
+wrksrc="pickleshare-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Small shelve-like datastore with concurrency support (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pickleshare/pickleshare"
+distfiles="${PYPI_SITE}/p/pickleshare/pickleshare-${version}.tar.gz"
+checksum=87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca
+
+post_install() {
+	vlicense LICENSE
+}

From 3a45e2242a05bcb7208492997170f8fd574ab1eb 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 20:56:36 +0700
Subject: [PATCH 48/68] python-picamera: drop package

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

diff --git a/srcpkgs/python-picamera/template b/srcpkgs/python-picamera/template
deleted file mode 100644
index e3c9a17bfdc..00000000000
--- a/srcpkgs/python-picamera/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-picamera'
-pkgname=python-picamera
-version=1.13
-revision=2
-archs=noarch
-wrksrc="picamera-${version}"
-build_style=python-module
-pycompile_module="picamera"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="A pure Python2 interface for the Raspberry Pi camera module"
-maintainer="cipr3s <cipr3s@gmx.com>"
-license="3-clause-BSD"
-homepage="https://github.com/waveform80/picamera"
-distfiles="${PYPI_SITE}/p/picamera/picamera-${version}.tar.gz"
-checksum=890815aa01e4d855a6a95dd3ad0953b872a6b954982106407df0c5a31a163e50
-
-# Skip hardware check
-export READTHEDOCS=True
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-picamera_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="picamera"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-picamera b/srcpkgs/python3-picamera
deleted file mode 120000
index baaaa4fdc86..00000000000
--- a/srcpkgs/python3-picamera
+++ /dev/null
@@ -1 +0,0 @@
-python-picamera
\ No newline at end of file
diff --git a/srcpkgs/python3-picamera/template b/srcpkgs/python3-picamera/template
new file mode 100644
index 00000000000..07bb4e7bb45
--- /dev/null
+++ b/srcpkgs/python3-picamera/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-picamera'
+pkgname=python3-picamera
+version=1.13
+revision=3
+wrksrc="picamera-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure Python3 interface for the Raspberry Pi camera module"
+maintainer="cipr3s <cipr3s@gmx.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/waveform80/picamera"
+distfiles="${PYPI_SITE}/p/picamera/picamera-${version}.tar.gz"
+checksum=890815aa01e4d855a6a95dd3ad0953b872a6b954982106407df0c5a31a163e50
+
+# Skip hardware check
+export READTHEDOCS=True
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 52eda93e01ad1f3da2248a94d080f6c0ba346398 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 20:57:15 +0700
Subject: [PATCH 49/68] python-pgmigrate: drop package

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

diff --git a/srcpkgs/python-pgmigrate/template b/srcpkgs/python-pgmigrate/template
deleted file mode 100644
index f98052f4151..00000000000
--- a/srcpkgs/python-pgmigrate/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-pgmigrate'
-pkgname=python-pgmigrate
-version=1.0.5
-revision=2
-archs=noarch
-wrksrc="pgmigrate-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-future python-sqlparse python-psycopg2 python-yaml"
-short_desc="Simple tool to evolve PostgreSQL schema easily (Python2)"
-maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
-license="PostgreSQL"
-homepage="https://github.com/yandex/pgmigrate"
-distfiles="https://github.com/yandex/pgmigrate/archive/${version}.tar.gz"
-checksum=0ab726797a76e63d562e1de204cea0ee82316249fa136548976452ed32934a1b
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pgmigrate_package() {
-	archs=noarch
-	depends="python3 python3-sqlparse python3-psycopg2 python3-yaml"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/pgmigrate3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pgmigrate b/srcpkgs/python3-pgmigrate
deleted file mode 120000
index 31ab7975918..00000000000
--- a/srcpkgs/python3-pgmigrate
+++ /dev/null
@@ -1 +0,0 @@
-python-pgmigrate
\ No newline at end of file
diff --git a/srcpkgs/python3-pgmigrate/template b/srcpkgs/python3-pgmigrate/template
new file mode 100644
index 00000000000..d72812a21b5
--- /dev/null
+++ b/srcpkgs/python3-pgmigrate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pgmigrate'
+pkgname=python3-pgmigrate
+version=1.0.5
+revision=3
+wrksrc="pgmigrate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-sqlparse python3-psycopg2 python3-yaml"
+short_desc="Simple tool to evolve PostgreSQL schema easily (Python3)"
+maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
+license="PostgreSQL"
+homepage="https://github.com/yandex/pgmigrate"
+distfiles="https://github.com/yandex/pgmigrate/archive/${version}.tar.gz"
+checksum=0ab726797a76e63d562e1de204cea0ee82316249fa136548976452ed32934a1b
+
+post_install() {
+	vlicense LICENSE
+}

From b333b24235ba59f9fdb97c7bdb9b67de7f7c2156 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 20:58:13 +0700
Subject: [PATCH 50/68] python-pdfrw: drop package

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

diff --git a/srcpkgs/python-pdfrw/template b/srcpkgs/python-pdfrw/template
deleted file mode 100644
index ef7db98e491..00000000000
--- a/srcpkgs/python-pdfrw/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-pdfrw'
-pkgname=python-pdfrw
-version=0.4
-revision=3
-archs=noarch
-replaces="python-pdfrw-example<${version}_${revision}"
-wrksrc="${pkgname/python-//}-${version}"
-build_style=python-module
-pycompile_module="pdfrw"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure Python2 library that reads and writes PDFs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT, BSD-3-Clause"
-homepage="https://github.com/pmaupin/pdfrw"
-distfiles="${PYPI_SITE}/p/pdfrw/pdfrw-${version}.tar.gz"
-checksum=0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4
-
-post_install() {
-	vlicense LICENSE.txt
-	vmkdir usr/share/examples/${pkgname}
-	vcopy examples/* usr/share/examples/${pkgname}
-}
-
-python3-pdfrw_package() {
-	replaces="python-pdfrw-example<${version}_${revision}"
-	archs=noarch
-	pycompile_module="pdfrw"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vmkdir usr/share/examples/${pkgname}
-		vcopy examples/* usr/share/examples/${pkgname}
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-pdfrw b/srcpkgs/python3-pdfrw
deleted file mode 120000
index 031da988534..00000000000
--- a/srcpkgs/python3-pdfrw
+++ /dev/null
@@ -1 +0,0 @@
-python-pdfrw
\ No newline at end of file
diff --git a/srcpkgs/python3-pdfrw/template b/srcpkgs/python3-pdfrw/template
new file mode 100644
index 00000000000..eb32d8c379b
--- /dev/null
+++ b/srcpkgs/python3-pdfrw/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pdfrw'
+pkgname=python3-pdfrw
+version=0.4
+revision=4
+wrksrc="pdfrw-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure Python3 library that reads and writes PDFs"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT, BSD-3-Clause"
+homepage="https://github.com/pmaupin/pdfrw"
+distfiles="${PYPI_SITE}/p/pdfrw/pdfrw-${version}.tar.gz"
+checksum=0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4
+replaces="python-pdfrw-example>=0"
+
+post_install() {
+	vlicense LICENSE.txt
+	vmkdir usr/share/examples/${pkgname}
+	vcopy examples/* usr/share/examples/${pkgname}
+}

From 9f5ddb481ce975764c9af1e955df4f0db7f31159 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 20:58:47 +0700
Subject: [PATCH 51/68] python-pbkdf2: drop package

---
 srcpkgs/python3-pbkdf2                        |  1 -
 .../template                                  | 26 +++++--------------
 2 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/python3-pbkdf2
 rename srcpkgs/{python-pbkdf2 => python3-pbkdf2}/template (51%)

diff --git a/srcpkgs/python3-pbkdf2 b/srcpkgs/python3-pbkdf2
deleted file mode 120000
index 1ccd4e1a53f..00000000000
--- a/srcpkgs/python3-pbkdf2
+++ /dev/null
@@ -1 +0,0 @@
-python-pbkdf2
\ No newline at end of file
diff --git a/srcpkgs/python-pbkdf2/template b/srcpkgs/python3-pbkdf2/template
similarity index 51%
rename from srcpkgs/python-pbkdf2/template
rename to srcpkgs/python3-pbkdf2/template
index 956d0b4cad9..fd02716b302 100644
--- a/srcpkgs/python-pbkdf2/template
+++ b/srcpkgs/python3-pbkdf2/template
@@ -1,29 +1,17 @@
-# Template file for 'python-pbkdf2'
-pkgname=python-pbkdf2
+# Template file for 'python3-pbkdf2'
+pkgname=python3-pbkdf2
 version=1.3
-revision=4
-archs=noarch
+revision=5
 wrksrc="pbkdf2-${version}"
-build_style=python-module
-pycompile_module="pbkdf2"
-hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Password-based key derivation function PBKDF2 (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Password-based key derivation function PBKDF2 (Python3)"
 maintainer="Charles E. Lehner <cel@celehner.com>"
-homepage="http://www.dlitz.net/software/python-pbkdf2/"
 license="MIT"
+homepage="http://www.dlitz.net/software/python-pbkdf2/"
 distfiles="${PYPI_SITE}/p/pbkdf2/pbkdf2-${version}.tar.gz"
 checksum=ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979
 
 post_install() {
 	vlicense README.txt
 }
-
-python3-pbkdf2_package() {
-	archs=noarch
-	pycompile_module="pbkdf2"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense README.txt
-	}
-}

From e0820dab7c1779a204ddfd7a842be462f90e0084 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:00:23 +0700
Subject: [PATCH 52/68] python-pathtools: drop package

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

diff --git a/srcpkgs/python-pathtools/template b/srcpkgs/python-pathtools/template
deleted file mode 100644
index 47dc6ef6a71..00000000000
--- a/srcpkgs/python-pathtools/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pathtools'
-pkgname=python-pathtools
-version=0.1.2
-revision=2
-archs=noarch
-wrksrc="pathtools-${version}"
-build_style=python-module
-pycompile_module="pathtools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="File system general utilities (Python2)"
-maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
-homepage="https://github.com/gorakhargosh/pathtools"
-license="MIT"
-distfiles="${PYPI_SITE}/p/pathtools/pathtools-${version}.tar.gz"
-checksum=7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pathtools_package() {
-	archs=noarch
-	pycompile_module="pathtools"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pathtools b/srcpkgs/python3-pathtools
deleted file mode 120000
index febf45fa60f..00000000000
--- a/srcpkgs/python3-pathtools
+++ /dev/null
@@ -1 +0,0 @@
-python-pathtools
\ No newline at end of file
diff --git a/srcpkgs/python3-pathtools/template b/srcpkgs/python3-pathtools/template
new file mode 100644
index 00000000000..8e5c7a04026
--- /dev/null
+++ b/srcpkgs/python3-pathtools/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pathtools'
+pkgname=python3-pathtools
+version=0.1.2
+revision=3
+wrksrc="pathtools-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="File system general utilities (Python3)"
+maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
+license="MIT"
+homepage="https://github.com/gorakhargosh/pathtools"
+distfiles="${PYPI_SITE}/p/pathtools/pathtools-${version}.tar.gz"
+checksum=7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0
+
+post_install() {
+	vlicense LICENSE
+}

From 746e61b91410ea3fcf3cb84f0fb6bf792a8234f6 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:04:14 +0700
Subject: [PATCH 53/68] python-pathspec: drop package

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

diff --git a/srcpkgs/python-pathspec/template b/srcpkgs/python-pathspec/template
deleted file mode 100644
index bd4736ec45d..00000000000
--- a/srcpkgs/python-pathspec/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-pathspec'
-pkgname=python-pathspec
-version=0.6.0
-revision=2
-archs=noarch
-wrksrc="pathspec-${version}"
-build_style=python-module
-pycompile_module="pathspec"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 utility library for pattern matching of file paths"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
-homepage="https://github.com/cpburnz/python-path-specification"
-distfiles="${PYPI_SITE}/p/pathspec/pathspec-${version}.tar.gz"
-checksum=e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c
-
-do_check() {
-	python3 setup.py test
-}
-
-python3-pathspec_package() {
-	archs=noarch
-	pycompile_module="pathspec"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-pathspec b/srcpkgs/python3-pathspec
deleted file mode 120000
index 2ddef36db7d..00000000000
--- a/srcpkgs/python3-pathspec
+++ /dev/null
@@ -1 +0,0 @@
-python-pathspec
\ No newline at end of file
diff --git a/srcpkgs/python3-pathspec/template b/srcpkgs/python3-pathspec/template
new file mode 100644
index 00000000000..19859fb496e
--- /dev/null
+++ b/srcpkgs/python3-pathspec/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pathspec'
+pkgname=python3-pathspec
+version=0.6.0
+revision=3
+wrksrc="pathspec-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 utility library for pattern matching of file paths"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MPL-2.0"
+homepage="https://github.com/cpburnz/python-path-specification"
+distfiles="${PYPI_SITE}/p/pathspec/pathspec-${version}.tar.gz"
+checksum=e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c
+
+do_check() {
+	python3 setup.py test
+}

From 001ddbdebb73a7a61c13fe1aae1614591d6c9c12 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:05:05 +0700
Subject: [PATCH 54/68] python-pyscss: drop package

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

diff --git a/srcpkgs/python-pyscss/template b/srcpkgs/python-pyscss/template
deleted file mode 100644
index 1a8e9c44d7d..00000000000
--- a/srcpkgs/python-pyscss/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-pyscss'
-pkgname=python-pyscss
-version=1.3.5
-revision=7
-wrksrc="pyScss-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools pcre-devel"
-makedepends="pcre-devel python-devel python3-devel"
-depends="python-setuptools python-six python-enum34 python-pathlib"
-pycompile_module="scss"
-short_desc="Scss compiler for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://github.com/Kronuz/pyScss"
-license="MIT"
-distfiles="${PYPI_SITE}/p/pyScss/pyScss-${version}.tar.gz"
-checksum=14a25c33c221a66bb1f000a6a067f376528d3df2f9333cee9c95709a9280cdb0
-
-alternatives="
- pyscss:pyscss:/usr/bin/pyscss2
- pyscss:less2scss:/usr/bin/less2scss2"
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pyscss_package() {
-	alternatives="
-	 pyscss:pyscss:/usr/bin/pyscss3
-	 pyscss:less2scss:/usr/bin/less2scss3"
-	pycompile_module="scss"
-	depends="python3-setuptools python3-six"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pyscss b/srcpkgs/python3-pyscss
deleted file mode 120000
index 95d23879e13..00000000000
--- a/srcpkgs/python3-pyscss
+++ /dev/null
@@ -1 +0,0 @@
-python-pyscss
\ No newline at end of file
diff --git a/srcpkgs/python3-pyscss/template b/srcpkgs/python3-pyscss/template
new file mode 100644
index 00000000000..43daf164dc9
--- /dev/null
+++ b/srcpkgs/python3-pyscss/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pyscss'
+pkgname=python3-pyscss
+version=1.3.5
+revision=7
+wrksrc="pyScss-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools pcre-devel"
+makedepends="pcre-devel python3-devel"
+depends="python3-setuptools python3-six"
+short_desc="Scss compiler for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="http://github.com/Kronuz/pyScss"
+distfiles="${PYPI_SITE}/p/pyScss/pyScss-${version}.tar.gz"
+checksum=14a25c33c221a66bb1f000a6a067f376528d3df2f9333cee9c95709a9280cdb0
+
+conflicts="python-pyscss>=0"
+
+post_install() {
+	vlicense LICENSE
+}

From 8f1c30496b64b9bc6ec2c5a57686945d5bd71714 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:05:28 +0700
Subject: [PATCH 55/68] python-pathlib: drop package

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

diff --git a/srcpkgs/python-pathlib/template b/srcpkgs/python-pathlib/template
deleted file mode 100644
index 65704965145..00000000000
--- a/srcpkgs/python-pathlib/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-pathlib'
-pkgname=python-pathlib
-version=1.0.1
-revision=2
-archs=noarch
-wrksrc="pathlib-${version}"
-build_style=python2-module
-pycompile_module="pathlib.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 pathlib module"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://pypi.org/project/pathlib/"
-distfiles="${PYPI_SITE}/p/pathlib/pathlib-${version}.tar.gz"
-checksum=6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f
-
-post_install() {
-	vlicense LICENSE.txt
-}

From ba45fd2f5fd0265642e7a9d31d48c5a0650e6c2f 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:05:54 +0700
Subject: [PATCH 56/68] python-passlib: drop package

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

diff --git a/srcpkgs/python-passlib/template b/srcpkgs/python-passlib/template
deleted file mode 100644
index f46a3e92642..00000000000
--- a/srcpkgs/python-passlib/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-passlib'
-pkgname=python-passlib
-version=1.7.1
-revision=3
-archs=noarch
-wrksrc="passlib-${version}"
-build_style=python-module
-pycompile_module="passlib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Comprehensive password hashing framework for Python2"
-maintainer="Alin Dobre <alin.dobre@outlook.com>"
-license="BSD-3-Clause"
-homepage="https://bitbucket.org/ecollins/passlib"
-distfiles="${PYPI_SITE}/p/passlib/passlib-${version}.tar.gz"
-checksum=3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-passlib_package() {
-	archs=noarch
-	pycompile_module="passlib"
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-passlib b/srcpkgs/python3-passlib
deleted file mode 120000
index f608bfa2cb5..00000000000
--- a/srcpkgs/python3-passlib
+++ /dev/null
@@ -1 +0,0 @@
-python-passlib
\ No newline at end of file
diff --git a/srcpkgs/python3-passlib/template b/srcpkgs/python3-passlib/template
new file mode 100644
index 00000000000..cb40fdfef9a
--- /dev/null
+++ b/srcpkgs/python3-passlib/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-passlib'
+pkgname=python3-passlib
+version=1.7.1
+revision=4
+wrksrc="passlib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Comprehensive password hashing framework for Python3"
+maintainer="Alin Dobre <alin.dobre@outlook.com>"
+license="BSD-3-Clause"
+homepage="https://bitbucket.org/ecollins/passlib"
+distfiles="${PYPI_SITE}/p/passlib/passlib-${version}.tar.gz"
+checksum=3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0
+
+post_install() {
+	vlicense LICENSE
+}

From 407960044844798b2c1c9c9783067a194457b7bf 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:06:48 +0700
Subject: [PATCH 57/68] python-bibtexparser: drop package

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

diff --git a/srcpkgs/python-bibtexparser/template b/srcpkgs/python-bibtexparser/template
deleted file mode 100644
index c40115c9fb8..00000000000
--- a/srcpkgs/python-bibtexparser/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-bibtexparser'
-pkgname=python-bibtexparser
-version=1.1.0
-revision=2
-archs=noarch
-wrksrc="bibtexparser-${version}"
-build_style=python-module
-pycompile_module="bibtexparser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-parsing python-future"
-short_desc="Python2 package for parsing BibTeX"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="LGPL-3.0-only"
-homepage="https://github.com/sciunto-org/python-bibtexparser"
-distfiles="${PYPI_SITE}/b/bibtexparser/bibtexparser-${version}.tar.gz"
-checksum=df8966ea752db6d74657a69b9d684a61aa33457ad6d9d50e41c50ef7f374907f
-
-python3-bibtexparser_package() {
-	archs=noarch
-	pycompile_module="bibtexparser"
-	depends="python3-parsing python3-future"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-bibtexparser b/srcpkgs/python3-bibtexparser
deleted file mode 120000
index cfe1af4c4ca..00000000000
--- a/srcpkgs/python3-bibtexparser
+++ /dev/null
@@ -1 +0,0 @@
-python-bibtexparser
\ No newline at end of file
diff --git a/srcpkgs/python3-bibtexparser/template b/srcpkgs/python3-bibtexparser/template
new file mode 100644
index 00000000000..f0c05f8f76a
--- /dev/null
+++ b/srcpkgs/python3-bibtexparser/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-bibtexparser'
+pkgname=python3-bibtexparser
+version=1.1.0
+revision=3
+wrksrc="bibtexparser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-parsing python3-future"
+short_desc="Python3 package for parsing BibTeX"
+maintainer="xaltsc <xaltsc@protonmail.ch>"
+license="LGPL-3.0-only"
+homepage="https://github.com/sciunto-org/python-bibtexparser"
+distfiles="${PYPI_SITE}/b/bibtexparser/bibtexparser-${version}.tar.gz"
+checksum=df8966ea752db6d74657a69b9d684a61aa33457ad6d9d50e41c50ef7f374907f

From 41c629380bae089835974b69c2360e8437ada186 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:07:30 +0700
Subject: [PATCH 58/68] python-parse: drop package

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

diff --git a/srcpkgs/python-parse/template b/srcpkgs/python-parse/template
deleted file mode 100644
index 9ccdc26d51e..00000000000
--- a/srcpkgs/python-parse/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-parse'
-pkgname=python-parse
-version=1.12.0
-revision=2
-archs=noarch
-wrksrc="parse-${version}"
-build_style=python-module
-pycompile_module="parse.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Parse strings using the format() syntax (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/r1chardj0n3s/parse"
-distfiles="${PYPI_SITE}/p/parse/parse-${version}.tar.gz"
-checksum=1b68657434d371e5156048ca4a0c5aea5afc6ca59a2fea4dd1a575354f617142
-
-do_check() {
-	python2 setup.py test
-	python3 setup.py test
-}
-
-post_install() {
-	sed -n '/Copyright/,/SOFTWARE\./p' parse.py >LICENSE
-	vlicense LICENSE
-}
-
-python3-parse_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="parse.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-parse b/srcpkgs/python3-parse
deleted file mode 120000
index 7649da2d9ed..00000000000
--- a/srcpkgs/python3-parse
+++ /dev/null
@@ -1 +0,0 @@
-python-parse
\ No newline at end of file
diff --git a/srcpkgs/python3-parse/template b/srcpkgs/python3-parse/template
new file mode 100644
index 00000000000..fce303974b8
--- /dev/null
+++ b/srcpkgs/python3-parse/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-parse'
+pkgname=python3-parse
+version=1.12.0
+revision=3
+wrksrc="parse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Parse strings using the format() syntax (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/r1chardj0n3s/parse"
+distfiles="${PYPI_SITE}/p/parse/parse-${version}.tar.gz"
+checksum=1b68657434d371e5156048ca4a0c5aea5afc6ca59a2fea4dd1a575354f617142
+
+do_check() {
+	python3 setup.py test
+}
+
+post_install() {
+	sed -n '/Copyright/,/SOFTWARE\./p' parse.py >LICENSE
+	vlicense LICENSE
+}

From 0068060ba4cabe4b1ead754c09498476e22b4d48 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:08:04 +0700
Subject: [PATCH 59/68] python-pandocfilters: drop package

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

diff --git a/srcpkgs/python-pandocfilters/template b/srcpkgs/python-pandocfilters/template
deleted file mode 100644
index 8650d20256f..00000000000
--- a/srcpkgs/python-pandocfilters/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pandocfilters'
-pkgname=python-pandocfilters
-version=1.4.2
-revision=3
-archs=noarch
-wrksrc="pandocfilters-${version}"
-build_style=python-module
-pycompile_module="pandocfilters.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 module for writing pandoc filters"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="http://github.com/jgm/pandocfilters"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/p/pandocfilters/pandocfilters-${version}.tar.gz"
-checksum=b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pandocfilters_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="pandocfilters.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pandocfilters b/srcpkgs/python3-pandocfilters
deleted file mode 120000
index cf3038c5c92..00000000000
--- a/srcpkgs/python3-pandocfilters
+++ /dev/null
@@ -1 +0,0 @@
-python-pandocfilters
\ No newline at end of file
diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template
new file mode 100644
index 00000000000..a15bce30b1e
--- /dev/null
+++ b/srcpkgs/python3-pandocfilters/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pandocfilters'
+pkgname=python3-pandocfilters
+version=1.4.2
+revision=4
+wrksrc="pandocfilters-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 module for writing pandoc filters"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://github.com/jgm/pandocfilters"
+distfiles="${PYPI_SITE}/p/pandocfilters/pandocfilters-${version}.tar.gz"
+checksum=b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9
+
+post_install() {
+	vlicense LICENSE
+}

From 59355cb6805d767249e26f9008c67de78dd206ce 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:09:21 +0700
Subject: [PATCH 60/68] python-pam: drop package

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

diff --git a/srcpkgs/python-pam/template b/srcpkgs/python-pam/template
deleted file mode 100644
index 780e9008ea7..00000000000
--- a/srcpkgs/python-pam/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-pam'
-pkgname=python-pam
-version=1.8.4
-revision=3
-archs=noarch
-build_style=python-module
-pycompile_module="pam.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python pam"
-short_desc="Python2 module for PAM authentication"
-maintainer="John <me@johnnynator.dev>"
-license="MIT"
-homepage="https://github.com/FirefighterBlu3/python-pam"
-distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz"
-checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pam_package() {
-	archs=noarch
-	depends="python3 pam"
-	pycompile_module="pam.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-pam b/srcpkgs/python3-pam
deleted file mode 120000
index 8fd44a7dbee..00000000000
--- a/srcpkgs/python3-pam
+++ /dev/null
@@ -1 +0,0 @@
-python-pam
\ No newline at end of file
diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template
new file mode 100644
index 00000000000..a95dbeb95d6
--- /dev/null
+++ b/srcpkgs/python3-pam/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pam'
+pkgname=python3-pam
+version=1.8.4
+revision=4
+wrksrc="python-pam-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 pam"
+short_desc="Python3 module for PAM authentication"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/FirefighterBlu3/python-pam"
+distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz"
+checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3
+
+post_install() {
+	vlicense LICENSE
+}

From 93cc4127509cad6edd75faaae53dc167b15e6400 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:10:18 +0700
Subject: [PATCH 61/68] python-ndg_httpsclient: drop package

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

diff --git a/srcpkgs/python-ndg_httpsclient/template b/srcpkgs/python-ndg_httpsclient/template
deleted file mode 100644
index 54b653f68a9..00000000000
--- a/srcpkgs/python-ndg_httpsclient/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-ndg_httpsclient'
-pkgname=python-ndg_httpsclient
-version=0.5.1
-revision=2
-archs=noarch
-wrksrc="ndg_httpsclient-${version}"
-build_style=python-module
-pycompile_module="ndg/httpsclient"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-openssl python-pyasn1"
-short_desc="HTTPS support for httplib and urllib2 (Python2)"
-maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
-license="BSD-3-Clause"
-homepage="https://github.com/cedadev/ndg_httpsclient"
-distfiles="${PYPI_SITE}/n/ndg_httpsclient/ndg_httpsclient-${version}.tar.gz"
-checksum=d72faed0376ab039736c2ba12e30695e2788c4aa569c9c3e3d72131de2592210
-alternatives="ndg_httpclient:ndg_httpclient:/usr/bin/ndg_httpclient2"
-
-post_install() {
-	vlicense ndg/httpsclient/LICENSE
-}
-
-python3-ndg_httpsclient_package() {
-	archs=noarch
-	depends="python3-openssl python3-pyasn1"
-	pycompile_module="ndg/httpsclient"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="ndg_httpclient:ndg_httpclient:/usr/bin/ndg_httpclient3"
-	pkg_install() {
-		vmove "usr/bin/*3"
-		vmove "usr/lib/python3*"
-		vlicense ndg/httpsclient/LICENSE
-	}
-}
diff --git a/srcpkgs/python3-ndg_httpsclient b/srcpkgs/python3-ndg_httpsclient
deleted file mode 120000
index c7fe8790b83..00000000000
--- a/srcpkgs/python3-ndg_httpsclient
+++ /dev/null
@@ -1 +0,0 @@
-python-ndg_httpsclient
\ No newline at end of file
diff --git a/srcpkgs/python3-ndg_httpsclient/template b/srcpkgs/python3-ndg_httpsclient/template
new file mode 100644
index 00000000000..df96d0081a0
--- /dev/null
+++ b/srcpkgs/python3-ndg_httpsclient/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-ndg_httpsclient'
+pkgname=python3-ndg_httpsclient
+version=0.5.1
+revision=3
+wrksrc="ndg_httpsclient-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-openssl python3-pyasn1"
+short_desc="HTTPS support for httplib and urllib2 (Python3)"
+maintainer="Joseph LaFreniere <joseph@lafreniere.xyz>"
+license="BSD-3-Clause"
+homepage="https://github.com/cedadev/ndg_httpsclient"
+distfiles="${PYPI_SITE}/n/ndg_httpsclient/ndg_httpsclient-${version}.tar.gz"
+checksum=d72faed0376ab039736c2ba12e30695e2788c4aa569c9c3e3d72131de2592210
+conflicts="python-ndg_httpsclient>=0"
+
+post_install() {
+	vlicense ndg/httpsclient/LICENSE
+}

From 81347dad2456a8cad8a2c499efe4fc8c4bd3e90a 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:10:53 +0700
Subject: [PATCH 62/68] python-natsort: drop package

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

diff --git a/srcpkgs/python-natsort/template b/srcpkgs/python-natsort/template
deleted file mode 100644
index 7101e297aad..00000000000
--- a/srcpkgs/python-natsort/template
+++ /dev/null
@@ -1,39 +0,0 @@
-# Template file for 'python-natsort'
-pkgname=python-natsort
-version=6.0.0
-revision=2
-archs=noarch
-wrksrc="natsort-${version}"
-build_style=python-module
-pycompile_module="natsort"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-checkdepends="python3-pytest-mock python3-hypothesis"
-short_desc="Simple yet flexible natural sorting in Python2"
-maintainer="Michal Koutenský <koutak.m@gmail.com>"
-license="MIT"
-homepage="https://github.com/SethMMorton/natsort"
-distfiles="${PYPI_SITE}/n/natsort/natsort-${version}.tar.gz"
-checksum=ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776
-alternatives="natsort:natsort:/usr/bin/natsort2"
-
-do_check() {
-	python3 -m pytest
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-natsort_package() {
-	archs=noarch
-	pycompile_module="natsort"
-	depends="python3-setuptools"
-	short_desc="${short_desc/Python2/Python3}"
-	alternatives="natsort:natsort:/usr/bin/natsort3"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-natsort b/srcpkgs/python3-natsort
deleted file mode 120000
index 58b9239919e..00000000000
--- a/srcpkgs/python3-natsort
+++ /dev/null
@@ -1 +0,0 @@
-python-natsort
\ No newline at end of file
diff --git a/srcpkgs/python3-natsort/template b/srcpkgs/python3-natsort/template
new file mode 100644
index 00000000000..d86211907f5
--- /dev/null
+++ b/srcpkgs/python3-natsort/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-natsort'
+pkgname=python3-natsort
+version=6.0.0
+revision=3
+wrksrc="natsort-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+checkdepends="python3-pytest-mock python3-hypothesis"
+short_desc="Simple yet flexible natural sorting in Python3"
+maintainer="Michal Koutenský <koutak.m@gmail.com>"
+license="MIT"
+homepage="https://github.com/SethMMorton/natsort"
+distfiles="${PYPI_SITE}/n/natsort/natsort-${version}.tar.gz"
+checksum=ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776
+conflicts="python-natsort>=0"
+
+do_check() {
+	python3 -m pytest
+}
+
+post_install() {
+	vlicense LICENSE
+}

From ff2fb92856596fa531a78572c5ac2019ca718456 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:13:12 +0700
Subject: [PATCH 63/68] python-olefile: drop package

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

diff --git a/srcpkgs/python-olefile/template b/srcpkgs/python-olefile/template
deleted file mode 100644
index 803d7b67cd8..00000000000
--- a/srcpkgs/python-olefile/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-olefile'
-pkgname=python-olefile
-version=0.46
-revision=2
-archs=noarch
-wrksrc="olefile-${version}"
-build_style=python-module
-pycompile_module="olefile"
-hostmakedepends="unzip python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 package to parse, read and write Microsoft OLE2 files"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://olefile.readthedocs.io/"
-license="BSD-2-Clause"
-distfiles="${PYPI_SITE}/o/olefile/olefile-${version}.zip"
-checksum=133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-olefile_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="olefile"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-
-	}
-}
diff --git a/srcpkgs/python3-olefile b/srcpkgs/python3-olefile
deleted file mode 120000
index ac13b87c464..00000000000
--- a/srcpkgs/python3-olefile
+++ /dev/null
@@ -1 +0,0 @@
-python-olefile
\ No newline at end of file
diff --git a/srcpkgs/python3-olefile/template b/srcpkgs/python3-olefile/template
new file mode 100644
index 00000000000..2f787215a92
--- /dev/null
+++ b/srcpkgs/python3-olefile/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-olefile'
+pkgname=python3-olefile
+version=0.46
+revision=3
+wrksrc="olefile-${version}"
+build_style=python3-module
+hostmakedepends="unzip python3-setuptools"
+depends="python3"
+short_desc="Python3 package to parse, read and write Microsoft OLE2 files"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://olefile.readthedocs.io/"
+distfiles="${PYPI_SITE}/o/olefile/olefile-${version}.zip"
+checksum=133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 642b07a01e10ffdfc923aa6a9f1910f9057e1b56 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:13:53 +0700
Subject: [PATCH 64/68] python-discogs_client: drop package

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

diff --git a/srcpkgs/python-discogs_client/template b/srcpkgs/python-discogs_client/template
deleted file mode 100644
index 5af18eda664..00000000000
--- a/srcpkgs/python-discogs_client/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-discogs_client'
-pkgname=python-discogs_client
-version=2.2.2
-revision=2
-archs=noarch
-wrksrc="discogs-client-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-requests python-six python-oauthlib"
-pycompile_module="discogs_client"
-short_desc="Official Discogs API client for Python2"
-maintainer="Georg Schabel <gescha@posteo.de>"
-homepage="https://github.com/discogs/discogs_client"
-license="BSD-2-Clause"
-distfiles="${PYPI_SITE}/d/discogs-client/discogs-client-${version}.tar.gz
- https://raw.githubusercontent.com/discogs/discogs_client/master/LICENSE"
-checksum="aeae43fb9281e27c580d1bcd484e6c309f4f3a05af3908016ee3363786ef43d8
- 1af62aeddccb57134218ddbdc67d0473524ca736703d7cce01db59b2e07da542"
-skip_extraction="LICENSE"
-
-post_install() {
-	vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE
-}
-
-python3-discogs_client_package() {
-	archs=noarch
-	depends="python3-requests python3-six python3-oauthlib"
-	pycompile_module="discogs_client"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/LICENSE
-	}
-}
diff --git a/srcpkgs/python3-discogs_client b/srcpkgs/python3-discogs_client
deleted file mode 120000
index 9eafeefc622..00000000000
--- a/srcpkgs/python3-discogs_client
+++ /dev/null
@@ -1 +0,0 @@
-python-discogs_client
\ No newline at end of file
diff --git a/srcpkgs/python3-discogs_client/template b/srcpkgs/python3-discogs_client/template
new file mode 100644
index 00000000000..b75992655b4
--- /dev/null
+++ b/srcpkgs/python3-discogs_client/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-discogs_client'
+pkgname=python3-discogs_client
+version=2.2.2
+revision=3
+wrksrc="discogs-client-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-six python3-oauthlib"
+short_desc="Official Discogs API client for Python3"
+maintainer="Georg Schabel <gescha@posteo.de>"
+license="BSD-2-Clause"
+homepage="https://github.com/discogs/discogs_client"
+distfiles="${PYPI_SITE}/d/discogs-client/discogs-client-${version}.tar.gz
+ https://raw.githubusercontent.com/discogs/discogs_client/master/LICENSE"
+checksum="aeae43fb9281e27c580d1bcd484e6c309f4f3a05af3908016ee3363786ef43d8
+ 1af62aeddccb57134218ddbdc67d0473524ca736703d7cce01db59b2e07da542"
+skip_extraction="LICENSE"
+
+post_install() {
+	vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE
+}

From 18bc8b30cba7f51b3968ea199b91e09f557c1f10 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:21:15 +0700
Subject: [PATCH 65/68] python-oauthlib: drop package

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

diff --git a/srcpkgs/python-oauthlib/template b/srcpkgs/python-oauthlib/template
deleted file mode 100644
index 036f1b31c92..00000000000
--- a/srcpkgs/python-oauthlib/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-oauthlib'
-pkgname=python-oauthlib
-version=3.1.0
-revision=2
-archs=noarch
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="oauthlib"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Implementation of the OAuth request-signing logic (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/oauthlib/oauthlib"
-distfiles="${PYPI_SITE}/o/oauthlib/oauthlib-${version}.tar.gz"
-checksum=bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-oauthlib_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="oauthlib"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python3-oauthlib b/srcpkgs/python3-oauthlib
deleted file mode 120000
index 40cc6b88aba..00000000000
--- a/srcpkgs/python3-oauthlib
+++ /dev/null
@@ -1 +0,0 @@
-python-oauthlib
\ No newline at end of file
diff --git a/srcpkgs/python3-oauthlib/template b/srcpkgs/python3-oauthlib/template
new file mode 100644
index 00000000000..642950f51e4
--- /dev/null
+++ b/srcpkgs/python3-oauthlib/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-oauthlib'
+pkgname=python3-oauthlib
+version=3.1.0
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Implementation of the OAuth request-signing logic (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/oauthlib/oauthlib"
+distfiles="${PYPI_SITE}/o/oauthlib/oauthlib-${version}.tar.gz"
+checksum=bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889
+
+post_install() {
+	vlicense LICENSE
+}

From 2397fcf3670ecb240e5a509bf169d643f0683fec 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:21:53 +0700
Subject: [PATCH 66/68] python-ntplib: drop package

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

diff --git a/srcpkgs/python-ntplib/template b/srcpkgs/python-ntplib/template
deleted file mode 100644
index 0582fb326c1..00000000000
--- a/srcpkgs/python-ntplib/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-ntplib'
-pkgname=python-ntplib
-version=0.3.3
-revision=4
-archs=noarch
-build_style=python-module
-wrksrc="ntplib-${version}"
-pycompile_module="ntplib.py"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="A simple interface to query NTP servers from Python2"
-maintainer="cipr3s <cipr3s@gmx.com>"
-license="MIT"
-homepage="http://code.google.com/archive/p/ntplib/"
-distfiles="${PYPI_SITE}/n/ntplib/ntplib-${version}.tar.gz"
-checksum="c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede"
-
-python3-ntplib_package() {
-	archs=noarch
-	depends="python3"
-	pycompile_module="ntplib.py"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-ntplib b/srcpkgs/python3-ntplib
deleted file mode 120000
index 5c1eddbf428..00000000000
--- a/srcpkgs/python3-ntplib
+++ /dev/null
@@ -1 +0,0 @@
-python-ntplib
\ No newline at end of file
diff --git a/srcpkgs/python3-ntplib/template b/srcpkgs/python3-ntplib/template
new file mode 100644
index 00000000000..6a071761fab
--- /dev/null
+++ b/srcpkgs/python3-ntplib/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-ntplib'
+pkgname=python3-ntplib
+version=0.3.3
+revision=5
+build_style=python3-module
+wrksrc="ntplib-${version}"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Simple interface to query NTP servers from Python3"
+maintainer="cipr3s <cipr3s@gmx.com>"
+license="MIT"
+homepage="http://code.google.com/archive/p/ntplib/"
+distfiles="${PYPI_SITE}/n/ntplib/ntplib-${version}.tar.gz"
+checksum="c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede"

From d5591f7a3a7931e6db1814e573611e3f7f747f48 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:32:17 +0700
Subject: [PATCH 67/68] python3-ntplib: update to 0.3.4.

---
 srcpkgs/python3-ntplib/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-ntplib/template b/srcpkgs/python3-ntplib/template
index 6a071761fab..811c9b25e9d 100644
--- a/srcpkgs/python3-ntplib/template
+++ b/srcpkgs/python3-ntplib/template
@@ -1,14 +1,21 @@
 # Template file for 'python3-ntplib'
 pkgname=python3-ntplib
-version=0.3.3
-revision=5
-build_style=python3-module
+version=0.3.4
+revision=1
 wrksrc="ntplib-${version}"
+build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Simple interface to query NTP servers from Python3"
 maintainer="cipr3s <cipr3s@gmx.com>"
 license="MIT"
 homepage="http://code.google.com/archive/p/ntplib/"
-distfiles="${PYPI_SITE}/n/ntplib/ntplib-${version}.tar.gz"
-checksum="c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede"
+# They deleted all old releases, PYPI only has wheel package of 0.3.4
+# distfiles="${PYPI_SITE}/n/ntplib/ntplib-${version}.tar.gz"
+distfiles="https://github.com/cf-natali/ntplib/archive/$version.tar.gz"
+checksum=e822d7142b84d72022b9caaf00f6d2a7541f9822f41e1c133839db1d7957abbe
+
+post_install() {
+	sed -n '/The MIT License/,/SOFTWARE[.]$/p' ntplib.py >LICENSE
+	vlicense LICENSE
+}

From 6680961b47c5bf9f9bd02b6ebbca41aff7dffbaf 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:37:33 +0700
Subject: [PATCH 68/68] python3-pyscss: update to 1.3.7.

1.3.5 could NOT be built with setuptools 47+
---
 srcpkgs/python3-pyscss/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyscss/template b/srcpkgs/python3-pyscss/template
index 43daf164dc9..07067cc2992 100644
--- a/srcpkgs/python3-pyscss/template
+++ b/srcpkgs/python3-pyscss/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyscss'
 pkgname=python3-pyscss
-version=1.3.5
-revision=7
+version=1.3.7
+revision=1
 wrksrc="pyScss-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools pcre-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://github.com/Kronuz/pyScss"
 distfiles="${PYPI_SITE}/p/pyScss/pyScss-${version}.tar.gz"
-checksum=14a25c33c221a66bb1f000a6a067f376528d3df2f9333cee9c95709a9280cdb0
+checksum=f1df571569021a23941a538eb154405dde80bed35dc1ea7c5f3e18e0144746bf
 
 conflicts="python-pyscss>=0"

next prev parent reply	other threads:[~2020-09-20 15:48 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-20 11:51 [PR PATCH] " sgn
2020-09-20 12:02 ` [PR PATCH] [Updated] " sgn
2020-09-20 12:45 ` sgn
2020-09-20 12:52 ` sgn
2020-09-20 14:17 ` sgn
2020-09-20 14:42 ` sgn
2020-09-20 15:04 ` [PR REVIEW] " ericonr
2020-09-20 15:04 ` ericonr
2020-09-20 15:11 ` benalb
2020-09-20 15:48 ` sgn [this message]
2020-09-20 16:06 ` [PR REVIEW] " sgn
2020-09-20 16:08 ` ericonr
2020-09-20 16:09 ` ericonr
2020-09-20 16:46 ` [PR PATCH] [Updated] " sgn
2020-09-20 23:16 ` fosslinux
2020-09-20 23:44 ` sgn
2020-09-22 14:03 ` [PR PATCH] [Closed]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200920154817.Mr3JTwmNSAdTRkk-K08YryrLOxlD0l2hwmwMAvVCc2Q@z \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).