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 14:45:05 +0200	[thread overview]
Message-ID: <20200920124505.6mHa2j2u1-eO-Qb8NaXHQK11jJmbpbk_1jkhaQfxJbg@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: 85704 bytes --]

From 7f5fef7a13bdcfd929f25dcd340c42102788ddb6 Mon Sep 17 00:00:00 2001
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 01/32] 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 87a5957183f0125d20e53d60f34a03aac4ef0eb5 Mon Sep 17 00:00:00 2001
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 02/32] 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 26b53ed5829dccf832bc885ce8c48146443b6eed Mon Sep 17 00:00:00 2001
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 03/32] 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 0c1f7705dc7c8aa26ada894a6502b0809e5fbe4b Mon Sep 17 00:00:00 2001
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 04/32] 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 fd507a8793ca699dbb81600bf23509c668653c25 Mon Sep 17 00:00:00 2001
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 05/32] 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 406907fec4b5687a60fb142081e6821e545880aa Mon Sep 17 00:00:00 2001
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 06/32] 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 e3f68028bf842d354c99acfb525ed2a000161a35 Mon Sep 17 00:00:00 2001
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 07/32] 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 1e6628f5c556422f3c72813dcf49681deee69f64 Mon Sep 17 00:00:00 2001
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 08/32] 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 aeec531ac231c5b50c9888e50423ef3e69922cac Mon Sep 17 00:00:00 2001
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 09/32] 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 6248a9072dd977ab839faece98a7716480666eb4 Mon Sep 17 00:00:00 2001
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 10/32] 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 ed54cacf0a6003cab46f5ec2ef27e3f381677627 Mon Sep 17 00:00:00 2001
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 11/32] 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 21b2e9607a688a1c1b4ba18eaeb007eab25e5864 Mon Sep 17 00:00:00 2001
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 12/32] python-pytest-fixture-config: drop package

---
 srcpkgs/python-pytest-fixture-config/template | 38 -------------------
 srcpkgs/python3-pytest-fixture-config         |  1 -
 .../python3-pytest-fixture-config/template    | 25 ++++++++++++
 3 files changed, 25 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..7ddbb519404
--- /dev/null
+++ b/srcpkgs/python3-pytest-fixture-config/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-pytest-fixture-config'
+pkgname=python3-pytest-fixture-config
+version=1.3.0
+revision=4
+wrksrc="${pkgname/python-//}-${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/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
+}

From f8eb4f2ab9e78d290733c0493c3ba0558c7e5efd Mon Sep 17 00:00:00 2001
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 13/32] 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 915f0ea8992042a33517faee85933c4f6c78af24 Mon Sep 17 00:00:00 2001
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 14/32] 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 d7cafe87f241ad59f063ce9ba255951e5b178f63 Mon Sep 17 00:00:00 2001
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 15/32] 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 ffd2d36fdbdba362ee511eed6f982710a03d1ee5 Mon Sep 17 00:00:00 2001
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 16/32] 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 aa7aeb022e881d3f3573b254d53e8e3c2b222792 Mon Sep 17 00:00:00 2001
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 17/32] 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 40cd1dc767de308e046f3bfabf4f9f29a92da1dd Mon Sep 17 00:00:00 2001
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 18/32] 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 b5b64d8555b05abce8956119117ba4c43645dd91 Mon Sep 17 00:00:00 2001
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 19/32] 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 48c3d47e2fa69865caa12025578837a6ec558dd0 Mon Sep 17 00:00:00 2001
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 20/32] 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 0e63763dfca61670cb063d8e27a528ac627fbc90 Mon Sep 17 00:00:00 2001
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 21/32] 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 a22b575a84b387941cc183e51e1ecf85cf039f36 Mon Sep 17 00:00:00 2001
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 22/32] 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 460779c97cefb18706939780139eedcd221cac97 Mon Sep 17 00:00:00 2001
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 23/32] 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 d39d1a06c6caa9280dc59b00edf0349df60279fe Mon Sep 17 00:00:00 2001
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 24/32] 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 0094032443ea6637675c4b7b1fade40065919233 Mon Sep 17 00:00:00 2001
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 25/32] 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..c3b9a931b1b
--- /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/python-/}-${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 ac3bda511429b17905847000172395fe8880e83f Mon Sep 17 00:00:00 2001
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 26/32] 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 09579aa34996bc85246fc1aca66c60218699e441 Mon Sep 17 00:00:00 2001
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 27/32] 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 0d70db13d0f274efe70e948ddec1e2ec3cde8f54 Mon Sep 17 00:00:00 2001
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 28/32] 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 674223923b64abaf35c6f37df8b766646e0294e6 Mon Sep 17 00:00:00 2001
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 29/32] 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 1d80a833e63dd31c5ec46025edb772fc44e9da45 Mon Sep 17 00:00:00 2001
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 30/32] python-ldap: drop package

---
 srcpkgs/python-ldap/template                 | 29 --------------------
 srcpkgs/python3-ldap                         |  1 -
 srcpkgs/python3-ldap/template                | 19 +++++++++++++
 srcpkgs/{python-ldap => python3-ldap}/update |  0
 4 files changed, 19 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..09dd1f3e647
--- /dev/null
+++ b/srcpkgs/python3-ldap/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-ldap'
+pkgname=python3-ldap
+version=3.2.0
+revision=2
+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 d2b10cd68221e5a7375513564225d1ae9dc0e432 Mon Sep 17 00:00:00 2001
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 31/32] 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 055d55e8541b6d28f36e54c8535e3129aea3ad3d Mon Sep 17 00:00:00 2001
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 32/32] 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

  parent reply	other threads:[~2020-09-20 12:45 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 [this message]
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 ` [PR PATCH] [Updated] " sgn
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=20200920124505.6mHa2j2u1-eO-Qb8NaXHQK11jJmbpbk_1jkhaQfxJbg@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).