From a9b55b490cd8ae8d5855d18dfc8a45bc7903d2c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/37] buildbot: remove

python 2
---
 srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
 srcpkgs/buildbot/template                | 26 ----------------
 srcpkgs/buildbot/update                  |  1 -
 3 files changed, 65 deletions(-)
 delete mode 100644 srcpkgs/buildbot/patches/terse-irc.patch
 delete mode 100644 srcpkgs/buildbot/template
 delete mode 100644 srcpkgs/buildbot/update

diff --git a/srcpkgs/buildbot/patches/terse-irc.patch b/srcpkgs/buildbot/patches/terse-irc.patch
deleted file mode 100644
index fd6e12edd1a864..00000000000000
--- a/srcpkgs/buildbot/patches/terse-irc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/buildbot/status/words.py
-+++ b/buildbot/status/words.py
-@@ -439,9 +439,9 @@
-         self.send(r)
- 
-     results_descriptions = {
--        SUCCESS: ("Success", 'GREEN'),
--        WARNINGS: ("Warnings", 'YELLOW'),
--        FAILURE: ("Failure", 'RED'),
-+        SUCCESS: ("OK", 'GREEN'),
-+        WARNINGS: ("Warn", 'YELLOW'),
-+        FAILURE: ("Fail", 'RED'),
-         EXCEPTION: ("Exception", 'PURPLE'),
-         RETRY: ("Retry", 'AQUA_LIGHT'),
-     }
-@@ -466,19 +466,18 @@
-         results = self.getResultsDescriptionAndColor(build.getResults())
-         if self.reportBuild(builder_name, buildnum):
-             if self.useRevisions:
--                r = "build containing revision(s) [%s] on %s is complete: %s" % \
-+                r = "%s/%s: %s" % \
-                     (buildrevs, builder_name, results[0])
-             else:
-                 r = "build #%d of %s is complete: %s" % \
-                     (buildnum, builder_name, results[0])
- 
--            r += ' [%s]' % maybeColorize(" ".join(build.getText()), results[1], self.useColors)
-             buildurl = self.bot.status.getURLForThing(build)
-             if buildurl:
--                r += "  Build details are at %s" % buildurl
-+                r += ": %s" % buildurl
- 
-             if self.bot.showBlameList and build.getResults() != SUCCESS and len(build.changes) != 0:
--                r += '  blamelist: ' + ', '.join(list(set([c.who for c in build.changes])))
-+                r += '  blame: ' + ', '.join(list(set([c.who for c in build.changes])))
- 
-             self.send(r)
- 
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
deleted file mode 100644
index ae905fc67ab834..00000000000000
--- a/srcpkgs/buildbot/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'buildbot'
-pkgname=buildbot
-reverts="2.4.1_1"
-version=0.8.14
-revision=5
-build_style=python2-module
-pycompile_dirs="usr/share/buildbot/contrib"
-hostmakedepends="python"
-depends="python-setuptools python-dateutil python-Jinja2 python-sqlalchemy-migrate python-Twisted"
-short_desc="System to automate the compile/test cycle"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://buildbot.net/"
-distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=331efd07bd7522c222a8fb258801e8d78332c88d778ee76416b9e1028676e964
-
-pre_install() {
-	sed -i 's,#!/usr/bin/env jython,#!/usr/bin/python2,' contrib/run_maxq.py
-}
-post_install() {
-	# Install all contrib modules.
-	local contribdir=${DESTDIR}/usr/share/buildbot/contrib
-
-	vmkdir usr/share/buildbot/contrib
-	install -m755 ${wrksrc}/contrib/*.py ${contribdir}
-}
diff --git a/srcpkgs/buildbot/update b/srcpkgs/buildbot/update
deleted file mode 100644
index aa695cd1c57bd7..00000000000000
--- a/srcpkgs/buildbot/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *rc* *post*"

From 1774b5da0e4eb367903c2293abdab4ce97b5f8e5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/37] buildbot-slave: remove

python 2
---
 srcpkgs/buildbot-slave/template | 13 -------------
 srcpkgs/buildbot-slave/update   |  1 -
 2 files changed, 14 deletions(-)
 delete mode 100644 srcpkgs/buildbot-slave/template
 delete mode 120000 srcpkgs/buildbot-slave/update

diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template
deleted file mode 100644
index 8b6c19bd9e3bd9..00000000000000
--- a/srcpkgs/buildbot-slave/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'buildbot-slave'
-pkgname=buildbot-slave
-version=0.8.14
-revision=3
-build_style=python2-module
-hostmakedepends="python"
-depends="python-Twisted"
-short_desc="BuildBot Slave Daemon"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
-homepage="https://buildbot.net/"
-distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7db02738c02d34c4d32508ac200e5f089ba73549315b127a9d8c0808d1a6d7a9
diff --git a/srcpkgs/buildbot-slave/update b/srcpkgs/buildbot-slave/update
deleted file mode 120000
index 7b5c744083b902..00000000000000
--- a/srcpkgs/buildbot-slave/update
+++ /dev/null
@@ -1 +0,0 @@
-../buildbot/update
\ No newline at end of file

From d772294150ebbf7bf6a99dc085ceb30af1643ec1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/37] python-Jinja2: remove

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

diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template
deleted file mode 100644
index d5f9ad00259b08..00000000000000
--- a/srcpkgs/python-Jinja2/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-Jinja2'
-pkgname=python-Jinja2
-version=2.11.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-MarkupSafe"
-short_desc="Full featured template engine (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://jinja.pocoo.org/"
-changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
-
-post_install() {
-	vlicense LICENSE.rst
-	# these files are valid only on Python 3.6+
-	rm -f ${DESTDIR}/${py2_sitelib}/jinja2/asyncsupport.py
-	rm -f ${DESTDIR}/${py2_sitelib}/jinja2/asyncfilters.py
-}
diff --git a/srcpkgs/python-Jinja2/update b/srcpkgs/python-Jinja2/update
deleted file mode 100644
index 3077367c01943b..00000000000000
--- a/srcpkgs/python-Jinja2/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="Jinja2-\K[0-9.]+(?=.tar.gz)"

From a5a69a290ecb6e1490a750e6a93c742ad157390a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/37] python-MarkupSafe: remove

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

diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template
deleted file mode 100644
index 50b338b06d1b1b..00000000000000
--- a/srcpkgs/python-MarkupSafe/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-MarkupSafe'
-pkgname=python-MarkupSafe
-version=1.1.1
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Implements a XML/HTML/XHTML Markup safe string for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://palletsprojects.com/p/markupsafe/"
-distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b
-
-post_install() {
-	vlicense LICENSE.rst
-}
diff --git a/srcpkgs/python-MarkupSafe/update b/srcpkgs/python-MarkupSafe/update
deleted file mode 100644
index 6e16f5da3819cc..00000000000000
--- a/srcpkgs/python-MarkupSafe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a[1-9] *rc[1-9]"

From 57ffbc5dc98f39d38d4378e8f64d220801c69fb1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/37] python-dateutil: remove

python 2
---
 .../patches/setuptools_scm.patch              | 28 -------------------
 srcpkgs/python-dateutil/template              | 21 --------------
 2 files changed, 49 deletions(-)
 delete mode 100644 srcpkgs/python-dateutil/patches/setuptools_scm.patch
 delete mode 100644 srcpkgs/python-dateutil/template

diff --git a/srcpkgs/python-dateutil/patches/setuptools_scm.patch b/srcpkgs/python-dateutil/patches/setuptools_scm.patch
deleted file mode 100644
index 9e5103ce4d46c7..00000000000000
--- a/srcpkgs/python-dateutil/patches/setuptools_scm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Void doesn't package setuptools_scm for Python 2, so remove the dependency.
-Leave a placeholder for version number that can be substituted at build.
-
-diff -ur a/setup.cfg b/setup.cfg
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -35,7 +35,6 @@
- 
- [options]
- zip_safe = True
--setup_requires = setuptools_scm
- install_requires = six >= 1.5
- python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*
- packages = find:
-diff -ur a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -47,9 +47,7 @@
- 
- 
- setup(
--      use_scm_version={
--          'write_to': 'dateutil/_version.py',
--      },
-+      version=%PKGVERSION%,
-       ## Needed since doctest not supported by PyPA.
-       long_description = README,
-       cmdclass={
diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
deleted file mode 100644
index cf8ce771084df4..00000000000000
--- a/srcpkgs/python-dateutil/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-dateutil'
-pkgname=python-dateutil
-version=2.8.2
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six tzdata"
-short_desc="Extensions to the standard Python2 datetime module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/dateutil/dateutil"
-distfiles="${PYPI_SITE}/p/python-dateutil/python-dateutil-${version}.tar.gz"
-checksum=0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86
-
-post_patch() {
-	vsed -i setup.py -e "s/%PKGVERSION%/'${version}'/"
-}
-
-post_install() {
-	vlicense LICENSE
-}

From 6390c9686a55bdcf1916db28302f670b06415e4b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/37] python-sqlalchemy-migrate: remove

python 2
---
 srcpkgs/python-sqlalchemy-migrate/template | 24 ----------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 srcpkgs/python-sqlalchemy-migrate/template

diff --git a/srcpkgs/python-sqlalchemy-migrate/template b/srcpkgs/python-sqlalchemy-migrate/template
deleted file mode 100644
index 72b6da7f2b5e58..00000000000000
--- a/srcpkgs/python-sqlalchemy-migrate/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-sqlalchemy-migrate'
-pkgname=python-sqlalchemy-migrate
-version=0.12.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools python-pbr"
-depends="python-pbr python-SQLAlchemy python-decorator python-six
- python-sqlparse python-tempita"
-short_desc="Database schema migration for SQLAlchemy (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/stackforge/sqlalchemy-migrate"
-distfiles="${PYPI_SITE}/s/sqlalchemy-migrate/sqlalchemy-migrate-${version}.tar.gz"
-checksum=8cfada30bbcf79a83b3a2d1bcd637de7e1f43e390d54de33e4f3249fd9aacfae
-
-alternatives="
- migrate:migrate-repository:/usr/bin/migrate-repository2
- migrate:migrate:/usr/bin/migrate2"
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/migrate-repository{,2}
-	mv ${DESTDIR}/usr/bin/migrate{,2}
-	vlicense COPYING LICENSE
-}

From c1233165bf03c0e53b8b01b480cc93a0b2de7252 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/37] python-sqlparse: remove

python 2
---
 srcpkgs/python-sqlparse/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/python-sqlparse/template

diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template
deleted file mode 100644
index 1690e9f651714d..00000000000000
--- a/srcpkgs/python-sqlparse/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-sqlparse'
-pkgname=python-sqlparse
-version=0.3.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="Non-validating SQL parser for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/andialbrecht/sqlparse"
-distfiles="${PYPI_SITE}/s/sqlparse/sqlparse-${version}.tar.gz"
-checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873
-alternatives="sqlparse:sqlformat:/usr/bin/sqlformat2"
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/sqlformat{,2}
-	vlicense LICENSE
-}

From b52cc9f44ff91b8fc6f8b4af81ec393b1ca1c555 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/37] python-tempita: remove

python 2
---
 srcpkgs/python-tempita/template | 13 -------------
 srcpkgs/python-tempita/update   |  1 -
 2 files changed, 14 deletions(-)
 delete mode 100644 srcpkgs/python-tempita/template
 delete mode 100644 srcpkgs/python-tempita/update

diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
deleted file mode 100644
index 28a57ed123a467..00000000000000
--- a/srcpkgs/python-tempita/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'python-tempita'
-pkgname=python-tempita
-version=0.5.2
-revision=8
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small text templating language for text substitution (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://pythonpaste.org/tempita/"
-distfiles="${PYPI_SITE}/T/Tempita/Tempita-${version}.tar.gz"
-checksum=cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c
diff --git a/srcpkgs/python-tempita/update b/srcpkgs/python-tempita/update
deleted file mode 100644
index 82446f12f6a313..00000000000000
--- a/srcpkgs/python-tempita/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*dev"

From 967f3a826e5e329544aec628e322178fedb25395 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/37] python-SQLAlchemy: remove

python 2
---
 srcpkgs/python-SQLAlchemy/template | 19 -------------------
 srcpkgs/python-SQLAlchemy/update   |  1 -
 2 files changed, 20 deletions(-)
 delete mode 100644 srcpkgs/python-SQLAlchemy/template
 delete mode 100644 srcpkgs/python-SQLAlchemy/update

diff --git a/srcpkgs/python-SQLAlchemy/template b/srcpkgs/python-SQLAlchemy/template
deleted file mode 100644
index f377aa8bf5acc4..00000000000000
--- a/srcpkgs/python-SQLAlchemy/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-SQLAlchemy'
-pkgname=python-SQLAlchemy
-version=1.3.18
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="SQL Toolkit and Object Relational Mapper for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://www.sqlalchemy.org"
-distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"
-checksum=da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7
-# no more python2 checks
-make_check=no
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python-SQLAlchemy/update b/srcpkgs/python-SQLAlchemy/update
deleted file mode 100644
index e9b0a0a5ea4cae..00000000000000
--- a/srcpkgs/python-SQLAlchemy/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b*"

From 8c6006ac4c3f3a8bd2f9378be1cc5b96f564d21c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/37] python-decorator: remove

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

diff --git a/srcpkgs/python-decorator/template b/srcpkgs/python-decorator/template
deleted file mode 100644
index 76ff46b5e85705..00000000000000
--- a/srcpkgs/python-decorator/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-decorator'
-pkgname=python-decorator
-version=4.4.2
-revision=2
-build_style=python2-module
-pycompile_module="decorator.py"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 decorator module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/micheles/decorator"
-changelog="https://raw.githubusercontent.com/micheles/decorator/master/CHANGES.md"
-distfiles="${PYPI_SITE}/d/decorator/decorator-${version}.tar.gz"
-checksum=e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7
-
-post_install() {
-	vlicense LICENSE.txt
-}
diff --git a/srcpkgs/python-decorator/update b/srcpkgs/python-decorator/update
deleted file mode 100644
index 8c1b46ba5d3a1f..00000000000000
--- a/srcpkgs/python-decorator/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# decorator >= 5.0 does not support Python 2
-pattern="decorator-\K4\.[0-9.]+(?=\.tar\.gz)"

From ccfa687aada3c7a09096368bc2af4cce6d71dfe0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/37] python-pbr: remove

python 2
---
 srcpkgs/python-pbr/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/python-pbr/template

diff --git a/srcpkgs/python-pbr/template b/srcpkgs/python-pbr/template
deleted file mode 100644
index 6621527715cf34..00000000000000
--- a/srcpkgs/python-pbr/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pbr'
-pkgname=python-pbr
-version=5.6.0
-revision=3
-build_style=python2-module
-pycompile_module="pbr"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 build reasonableness"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://docs.openstack.org/developer/pbr/"
-distfiles="${PYPI_SITE}/p/pbr/pbr-${version}.tar.gz"
-checksum=42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd
-alternatives="pbr:pbr:/usr/bin/pbr2"
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/pbr{,2}
-}

From e5dc7e2926ac2a7db1ee4082a70828dd755ae7b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/37] python-Twisted: remove

python 2
---
 srcpkgs/python-Twisted/INSTALL  |  5 -----
 srcpkgs/python-Twisted/REMOVE   |  5 -----
 srcpkgs/python-Twisted/template | 37 ---------------------------------
 srcpkgs/python-Twisted/update   |  1 -
 4 files changed, 48 deletions(-)
 delete mode 100644 srcpkgs/python-Twisted/INSTALL
 delete mode 100644 srcpkgs/python-Twisted/REMOVE
 delete mode 100644 srcpkgs/python-Twisted/template
 delete mode 100644 srcpkgs/python-Twisted/update

diff --git a/srcpkgs/python-Twisted/INSTALL b/srcpkgs/python-Twisted/INSTALL
deleted file mode 100644
index 2752e04bc9930e..00000000000000
--- a/srcpkgs/python-Twisted/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case ${ACTION} in
-post)
-	python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1
-	;;
-esac
diff --git a/srcpkgs/python-Twisted/REMOVE b/srcpkgs/python-Twisted/REMOVE
deleted file mode 100644
index 0ffe8186a9433a..00000000000000
--- a/srcpkgs/python-Twisted/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case ${ACTION} in
-purge)
-	find usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-	;;
-esac
diff --git a/srcpkgs/python-Twisted/template b/srcpkgs/python-Twisted/template
deleted file mode 100644
index 3ed1355228d9db..00000000000000
--- a/srcpkgs/python-Twisted/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'python-Twisted'
-pkgname=python-Twisted
-version=20.3.0
-revision=4
-build_style=python2-module
-hostmakedepends="python-setuptools python-incremental"
-makedepends="python-devel"
-depends="python-setuptools python-zope.interface python-openssl
- python-service_identity python-constantly python-incremental python-automat
- python-hyperlink python-PyHamcrest"
-short_desc="Asynchronous networking framework written in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://twistedmatrix.com/"
-changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
-distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.bz2"
-checksum=d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10
-
-alternatives="
- twisted:cftp:/usr/bin/cftp2
- twisted:ckeygen:/usr/bin/ckeygen2
- twisted:conch:/usr/bin/conch2
- twisted:mailmail:/usr/bin/mailmail2
- twisted:pyhtmlizer:/usr/bin/pyhtmlizer2
- twisted:tkconch:/usr/bin/tkconch2
- twisted:trial:/usr/bin/trial2
- twisted:twist:/usr/bin/twist2
- twisted:twistd:/usr/bin/twistd2"
-
-post_install() {
-	# don't conflict with python3-Twisted
-	for f in "${DESTDIR}"/usr/bin/*; do
-		mv "${f}"{,2}
-	done
-
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python-Twisted/update b/srcpkgs/python-Twisted/update
deleted file mode 100644
index e299d00ea67cd4..00000000000000
--- a/srcpkgs/python-Twisted/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*rc*"

From f460523da5706cf1780c63f738237e28004f5430 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/37] python-zope.interface: remove

python 2
---
 srcpkgs/python-zope.interface/template | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 srcpkgs/python-zope.interface/template

diff --git a/srcpkgs/python-zope.interface/template b/srcpkgs/python-zope.interface/template
deleted file mode 100644
index 64cae0e63031a2..00000000000000
--- a/srcpkgs/python-zope.interface/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-zope.interface'
-pkgname=python-zope.interface
-version=5.5.2
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-depends="python-setuptools"
-short_desc="Zope interfaces for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="ZPL-2.1"
-homepage="https://github.com/zopefoundation/zope.interface"
-changelog="https://raw.githubusercontent.com/zopefoundation/zope.interface/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/z/zope.interface/zope.interface-${version}.tar.gz"
-checksum=bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671
-# Tests can't find the package they test
-make_check=no
-
-post_install() {
-	# zope.interface provides the zope namespace
-	vinstall src/zope/__init__.py 644 ${py2_sitelib}/zope
-	vlicense LICENSE.txt LICENSE
-}

From 8974e77d5b00859f68f48490964a26013f1a6efa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/37] python-incremental: remove

python 2
---
 srcpkgs/python-incremental/template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-incremental/template

diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
deleted file mode 100644
index 0b50d35cfd154a..00000000000000
--- a/srcpkgs/python-incremental/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-incremental'
-pkgname=python-incremental
-version=21.3.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Small library that versions your Python projects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/incremental"
-changelog="https://raw.githubusercontent.com/twisted/incremental/trunk/NEWS.rst"
-distfiles="${PYPI_SITE}/i/incremental/incremental-${version}.tar.gz"
-checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
-
-post_install() {
-	vlicense LICENSE
-}

From 329a2f4d8ecec2cb4ef9e06ad30b418d5785574d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/37] python-hyperlink: remove

python 2
---
 srcpkgs/python-hyperlink/template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-hyperlink/template

diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
deleted file mode 100644
index 933b23f91da738..00000000000000
--- a/srcpkgs/python-hyperlink/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-hyperlink'
-pkgname=python-hyperlink
-version=21.0.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-idna"
-short_desc="Pure-Python implementation of immutable URLs (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/python-hyper/hyperlink"
-distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
-make_check=no # python2
-
-post_install() {
-	vlicense LICENSE
-}

From c30f92e186d30ff53dbd4f6f4a58a3aad9b02107 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/37] python-constantly: remove

python 2
---
 srcpkgs/python-constantly/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/python-constantly/template

diff --git a/srcpkgs/python-constantly/template b/srcpkgs/python-constantly/template
deleted file mode 100644
index 2baccb9c9c5ed0..00000000000000
--- a/srcpkgs/python-constantly/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-constantly'
-pkgname=python-constantly
-version=15.1.0
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Symbolic constants in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/twisted/constantly"
-distfiles="${PYPI_SITE}/c/constantly/constantly-${version}.tar.gz"
-checksum=586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35
-
-post_install() {
-	vlicense LICENSE
-}

From 47c351b646f9a29a60e0634e00d4f7d0cd485c53 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/37] python-service_identity: remove

python 2
---
 srcpkgs/python-service_identity/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/python-service_identity/template

diff --git a/srcpkgs/python-service_identity/template b/srcpkgs/python-service_identity/template
deleted file mode 100644
index 87e64c77030707..00000000000000
--- a/srcpkgs/python-service_identity/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-service_identity'
-pkgname=python-service_identity
-version=18.1.0
-revision=7
-build_style=python2-module
-pycompile_module="service_identity"
-hostmakedepends="python-setuptools"
-depends="python-attrs python-pyasn1-modules python-cryptography python-ipaddress"
-short_desc="Service identity verification for Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://service-identity.readthedocs.org/"
-changelog="https://raw.githubusercontent.com/pyca/service-identity/main/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/s/service_identity/service_identity-${version}.tar.gz"
-checksum=0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d
-
-post_install() {
-	vlicense LICENSE
-}

From 3266fd232a7c281c62da9348acddc0e6f41396ae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/37] python-automat: remove

python 2
---
 srcpkgs/python-automat/patches/py2fix.patch | 37 ---------------------
 srcpkgs/python-automat/template             | 27 ---------------
 2 files changed, 64 deletions(-)
 delete mode 100644 srcpkgs/python-automat/patches/py2fix.patch
 delete mode 100644 srcpkgs/python-automat/template

diff --git a/srcpkgs/python-automat/patches/py2fix.patch b/srcpkgs/python-automat/patches/py2fix.patch
deleted file mode 100644
index 8613b16afe9e1f..00000000000000
--- a/srcpkgs/python-automat/patches/py2fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Our builders still use the py2 version of this package.
-
---- a/automat/_methodical.py
-+++ b/automat/_methodical.py
-@@ -4,9 +4,15 @@
- from functools import wraps
- from itertools import count
- 
--from inspect import getfullargspec as getArgsSpec
-+try:
-+    # Python 3
-+    from inspect import getfullargspec as getArgsSpec
-+except ImportError:
-+    # Python 2
-+    from inspect import getargspec as getArgsSpec
- 
- import attr
-+import six
- 
- from ._core import Transitioner, Automaton
- from ._introspection import preserveName
-@@ -30,13 +36,13 @@
-     return ArgSpec(
-         args=tuple(spec.args),
-         varargs=spec.varargs,
--        varkw=spec.varkw,
-+        varkw=spec.varkw if six.PY3 else spec.keywords,
-         defaults=spec.defaults if spec.defaults else (),
-         kwonlyargs=tuple(spec.kwonlyargs),
-         kwonlydefaults=(
-             tuple(spec.kwonlydefaults.items())
-             if spec.kwonlydefaults else ()
--        ),
-+        ) if six.PY3 else (),
-         annotations=tuple(spec.annotations.items()),
-     )
- 
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
deleted file mode 100644
index cf564d324fc97a..00000000000000
--- a/srcpkgs/python-automat/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-automat'
-pkgname=python-automat
-version=22.10.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools python-attrs python-six"
-short_desc="Finite-state machines in Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/glyph/Automat"
-distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
-alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
-make_check=no # python2
-
-pre_build() {
-	sed -i setup.py \
-		-e '/print(/d' \
-		-e '/setup_requires=/,+3d' \
-		-e "s/use_scm_version=True/version='${version}'/"
-}
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/automat-visualize{,2}
-	vlicense LICENSE
-}

From e0540edfc21fa447ffb9d75c605b935046527f38 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/37] python-openssl: remove

python 2
---
 srcpkgs/python-openssl/template | 14 --------------
 srcpkgs/python-openssl/update   |  1 -
 2 files changed, 15 deletions(-)
 delete mode 100644 srcpkgs/python-openssl/template
 delete mode 100644 srcpkgs/python-openssl/update

diff --git a/srcpkgs/python-openssl/template b/srcpkgs/python-openssl/template
deleted file mode 100644
index f8cbcee80a52b7..00000000000000
--- a/srcpkgs/python-openssl/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'python-openssl'
-pkgname=python-openssl
-version=20.0.1
-revision=2
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-cryptography python-six"
-short_desc="Python2 interface to the OpenSSL library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://pyopenssl.org/"
-changelog="https://raw.githubusercontent.com/pyca/pyopenssl/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"
-checksum=4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51
diff --git a/srcpkgs/python-openssl/update b/srcpkgs/python-openssl/update
deleted file mode 100644
index 9946902a8048c0..00000000000000
--- a/srcpkgs/python-openssl/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pyOpenSSL

From 96455e8bbb9b6889a11b76e5d7fdb77a0515ff58 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/37] python-PyHamcrest: remove

python 2
---
 srcpkgs/python-PyHamcrest/template | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 srcpkgs/python-PyHamcrest/template

diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
deleted file mode 100644
index a121e35d207f79..00000000000000
--- a/srcpkgs/python-PyHamcrest/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-PyHamcrest'
-pkgname=python-PyHamcrest
-version=1.9.0
-revision=6
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six"
-short_desc="Hamcrest framework for matcher objects (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/hamcrest/PyHamcrest"
-distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
-checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
-
-pre_build() {
-	# drop setuptools from runtime requires
-	vsed -i "/install_requires=/s|'setuptools',||" setup.py
-}
-
-post_install() {
-	vlicense LICENSE.txt
-}

From 0ca93a6491e30d94eb5c1c82dde92d7116e897d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/37] python-pyasn1-modules: remove

python 2
---
 srcpkgs/python-pyasn1-modules/template | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 srcpkgs/python-pyasn1-modules/template

diff --git a/srcpkgs/python-pyasn1-modules/template b/srcpkgs/python-pyasn1-modules/template
deleted file mode 100644
index fde6b7aa8ae847..00000000000000
--- a/srcpkgs/python-pyasn1-modules/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-pyasn1-modules'
-pkgname=python-pyasn1-modules
-version=0.2.8
-revision=6
-build_style=python2-module
-pycompile_module="pyasn1_modules"
-hostmakedepends="python-setuptools"
-depends="python-pyasn1"
-checkdepends="python-pyasn1"
-short_desc="Collection of ASN.1-based protocols modules (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1-modules"
-distfiles="https://github.com/etingof/pyasn1-modules/archive/v${version}.tar.gz"
-checksum=c562fcf94e21b19b1b01c103a4dbe24b286356237d2b453afd75882683cf0ad7
-
-do_check() {
-	python setup.py test
-}
-
-post_install() {
-	vlicense LICENSE.txt
-}

From 42bf496be0d8bc7de9894edab13e812ddfc8c5aa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/37] python-attrs: remove

python 2
---
 srcpkgs/python-attrs/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/python-attrs/template

diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
deleted file mode 100644
index ac6800f757c5df..00000000000000
--- a/srcpkgs/python-attrs/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-attrs'
-pkgname=python-attrs
-version=21.2.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Attributes without boilerplate (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://attrs.readthedocs.io/"
-distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-
-post_install() {
-	vlicense LICENSE
-}

From a44930620fc80c0a30f2d0fb4d209fad6777be34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/37] python-cryptography: remove

python 2
---
 srcpkgs/python-cryptography/template | 23 -----------------------
 srcpkgs/python-cryptography/update   |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 srcpkgs/python-cryptography/template
 delete mode 100644 srcpkgs/python-cryptography/update

diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
deleted file mode 100644
index 208be9dade3afc..00000000000000
--- a/srcpkgs/python-cryptography/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-cryptography'
-pkgname=python-cryptography
-version=3.3.2
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools openssl-devel python-enum34
- python-ipaddress python-six python-cffi python-idna"
-makedepends="openssl-devel python-devel"
-depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
-short_desc="Python2 library that provides cryptographic recipes and primitives"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause, Apache-2.0"
-homepage="https://github.com/pyca/cryptography"
-changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed
-# Test dependency python-iso8601 has been dropped
-make_check=no
-
-post_install() {
-	vlicense LICENSE
-	vlicense LICENSE.BSD
-}
diff --git a/srcpkgs/python-cryptography/update b/srcpkgs/python-cryptography/update
deleted file mode 100644
index b128c2f3bcf83d..00000000000000
--- a/srcpkgs/python-cryptography/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# cryptography >= 3.4 does not support Python 2
-pattern="cryptography-\K3\.3\.[0-9.]+(?=.tar.gz)"

From 2482abf5420422de4b352c4212f48a50d7c42587 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/37] python-six: remove

python 2
---
 srcpkgs/python-six/template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-six/template

diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
deleted file mode 100644
index dbf1e2280b1ec5..00000000000000
--- a/srcpkgs/python-six/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-six'
-pkgname=python-six
-version=1.16.0
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python 2 and 3 compatibility utilities (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/benjaminp/six"
-changelog="https://raw.githubusercontent.com/benjaminp/six/master/CHANGES"
-distfiles="${PYPI_SITE}/s/six/six-${version}.tar.gz"
-checksum=1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926
-
-post_install() {
-	vlicense LICENSE
-}

From 4e8b8891bca37b50dcfb502b23b4b7413be8a626 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/37] python-cffi: remove

python 2
---
 srcpkgs/python-cffi/template | 24 ------------------------
 srcpkgs/python-cffi/update   |  1 -
 2 files changed, 25 deletions(-)
 delete mode 100644 srcpkgs/python-cffi/template
 delete mode 100644 srcpkgs/python-cffi/update

diff --git a/srcpkgs/python-cffi/template b/srcpkgs/python-cffi/template
deleted file mode 100644
index 683db6c7b96794..00000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-reverts="1.16.0_1"
-version=1.15.1
-revision=3
-build_style=python2-module
-hostmakedepends="python-setuptools libffi-devel"
-makedepends="python-devel libffi-devel"
-depends="python-pycparser"
-short_desc="C foreign function interface for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://cffi.readthedocs.io/"
-changelog="https://cffi.readthedocs.io/en/latest/whatsnew.html"
-distfiles="${PYPI_SITE}/c/cffi/cffi-${version}.tar.gz"
-checksum=d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
-	makedepends+=" libxcrypt-devel"
-fi
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python-cffi/update b/srcpkgs/python-cffi/update
deleted file mode 100644
index 32c6fdfdd407eb..00000000000000
--- a/srcpkgs/python-cffi/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*b* *dev* *rc*"

From ca11147ddfe966764bce32c26a45f74f8e410fea Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/37] python-pycparser: remove

python 2
---
 srcpkgs/python-pycparser/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/python-pycparser/template

diff --git a/srcpkgs/python-pycparser/template b/srcpkgs/python-pycparser/template
deleted file mode 100644
index 9986b23c06f4d5..00000000000000
--- a/srcpkgs/python-pycparser/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pycparser'
-pkgname=python-pycparser
-version=2.21
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-ply"
-short_desc="Complete C99 parser in pure Python (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/eliben/pycparser"
-license="BSD-3-Clause"
-distfiles="${PYPI_SITE}/p/pycparser/pycparser-${version}.tar.gz"
-checksum=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-
-post_install() {
-	rm -rf ${DESTDIR}/${py2_sitelib}/pycparser/ply
-	ln -sf ../ply ${DESTDIR}/${py2_sitelib}/pycparser/ply
-	vlicense LICENSE
-}

From 8d0ab0d6684712e7ff0fcf238c244800918f093b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/37] python-ply: remove

python 2
---
 srcpkgs/python-ply/template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-ply/template

diff --git a/srcpkgs/python-ply/template b/srcpkgs/python-ply/template
deleted file mode 100644
index 06e7915166924f..00000000000000
--- a/srcpkgs/python-ply/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-ply'
-pkgname=python-ply
-version=3.11
-revision=7
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Lex and Yacc for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://www.dabeaz.com/ply/"
-distfiles="${PYPI_SITE}/p/ply/ply-${version}.tar.gz"
-checksum=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
-
-post_install() {
-	sed -n '/Copyright/,/POSSIBILITY/p' README.md >LICENSE
-	vlicense LICENSE
-}

From bb291d67c17572118015e4772f996823e3e2e3f0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/37] python-enum34: remove

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

diff --git a/srcpkgs/python-enum34/template b/srcpkgs/python-enum34/template
deleted file mode 100644
index fc777e1dc999cc..00000000000000
--- a/srcpkgs/python-enum34/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'python-enum34'
-pkgname=python-enum34
-version=1.1.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Backport of Python 3.4 enum module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/enum34/"
-distfiles="${PYPI_SITE}/e/enum34/enum34-${version}.tar.gz"
-checksum=cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248
-
-pre_build() {
-	# remove doc
-	vsed -i "/'enum' :/,+6d" setup.py
-}
-post_install() {
-	vlicense enum/LICENSE
-}

From fcb0c3fe4b51ad0e4783c0e63e737d773096ef06 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/37] python-idna: remove

python 2
---
 srcpkgs/python-idna/template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-idna/template

diff --git a/srcpkgs/python-idna/template b/srcpkgs/python-idna/template
deleted file mode 100644
index aef159eeb76aa6..00000000000000
--- a/srcpkgs/python-idna/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-idna'
-pkgname=python-idna
-version=2.10
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Internationalized Domain Names in Applications (IDNA) for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/kjd/idna"
-changelog="https://raw.githubusercontent.com/kjd/idna/master/HISTORY.rst"
-distfiles="${PYPI_SITE}/i/idna/idna-${version}.tar.gz"
-checksum=b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6
-
-post_install() {
-	vlicense LICENSE.rst
-}

From 8096d69e6ebb7c03e7c3ae1a149d00dd5183dfed Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/37] python-ipaddress: remove

python 2
---
 srcpkgs/python-ipaddress/template | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 srcpkgs/python-ipaddress/template

diff --git a/srcpkgs/python-ipaddress/template b/srcpkgs/python-ipaddress/template
deleted file mode 100644
index 915fce3f2c80bd..00000000000000
--- a/srcpkgs/python-ipaddress/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-ipaddress'
-pkgname=python-ipaddress
-version=1.0.23
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Backport of Python 3.3+ ipaddress module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="PSF-2.0"
-homepage="https://github.com/phihag/ipaddress"
-distfiles="${PYPI_SITE}/i/ipaddress/ipaddress-${version}.tar.gz"
-checksum=b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2
-
-post_install() {
-	vlicense LICENSE
-}

From 59b614f873a304dd2aab68c527cb6e05ae95238a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/37] python-pyasn1: remove

python 2
---
 srcpkgs/python-pyasn1/template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 srcpkgs/python-pyasn1/template

diff --git a/srcpkgs/python-pyasn1/template b/srcpkgs/python-pyasn1/template
deleted file mode 100644
index e211f6c26ae2c4..00000000000000
--- a/srcpkgs/python-pyasn1/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'python-pyasn1'
-pkgname=python-pyasn1
-version=0.4.8
-revision=5
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="ASN.1 library for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause"
-homepage="https://github.com/etingof/pyasn1"
-changelog="https://raw.githubusercontent.com/etingof/pyasn1/master/CHANGES.rst"
-distfiles="${PYPI_SITE}/p/pyasn1/pyasn1-${version}.tar.gz"
-checksum=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
-
-post_install() {
-	vlicense LICENSE.rst
-}

From 8ca306d30c0104762e1aa9a5e81bdabcffd6241c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/37] removed-packages: add buildbot and dependency tree

---
 srcpkgs/removed-packages/template | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 51b665f01c180e..d112938291237a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -49,6 +49,8 @@ replaces="
  bluez-qt5<=5.115.0_1
  bokken<=1.8_3
  bomi<=0.9.11_17
+ buildbot-slave<=0.8.14_3
+ buildbot<=0.8.14_5
  burp-client<=1.4.40_13
  burp-server<=1.4.40_13
  bzr<=2.7.0_1
@@ -574,29 +576,42 @@ replaces="
  pystopwatch<=2019_2
  python-Babel<=2.8.0_4
  python-Cython<=0.29.36_1
+ python-Jinja2<=2.11.3_2
  python-M2Crypto<=0.35.2_7
+ python-MarkupSafe<=1.1.1_7
  python-Pillow<=6.2.2_3
+ python-PyHamcrest<=1.9.0_6
  python-PyQt4<=4.12.1_4
  python-Pygments<=2.5.2_4
+ python-SQLAlchemy<=1.3.18_5
  python-SecretStorage<=2.3.1_4
+ python-Twisted<=20.3.0_4
  python-atomicwrites<=1.4.0_2
+ python-attrs<=21.2.0_3
  python-audit<=2.8.5_2
+ python-automat<=22.10.0_2
  python-backports.configparser<=3.5.0_2
  python-backports.functools_lru_cache<=1.5_2
  python-backports<=1.0_5
  python-boto<=2.49.0_5
  python-cairo-devel<=1.18.2_2
  python-cairo<=1.18.2_2
+ python-cffi<=1.15.1_2
  python-chardet<=4.0.0_3
  python-configobj<=5.0.6_9
+ python-constantly<=15.1.0_7
  python-contextlib2<=0.6.0.post1_1
  python-coverage<=5.0.3_3
  python-crypto<=3.9.7_3
+ python-cryptography<=3.3.2_3
  python-cryptography_vectors<=3.3.2_1
+ python-dateutil<=2.8.2_2
  python-dbus<=1.2.18_3
+ python-decorator<=4.4.2_2
  python-distutils-extra<=2.39_8
  python-docutils<=0.16_3
  python-enchant<=2.0.0_4
+ python-enum34<=1.1.10_1
  python-evdev<=1.2.0_5
  python-funcsigs<=1.0.2_2
  python-gntp<=1.0.3_7
@@ -604,8 +619,12 @@ replaces="
  python-gobject2-devel<=2.28.7_2
  python-gobject2<=2.28.7_2
  python-gobject<=3.36.1_2
+ python-hyperlink<=21.0.0_3
  python-hypothesis<=4.38.2_5
+ python-idna<=2.10_1
  python-importlib_metadata<=2.1.1_1
+ python-incremental<=21.3.0_2
+ python-ipaddress<=1.0.23_2
  python-iso8601<=0.1.16_2
  python-isodate<=0.6.0_5
  python-jellyfish<=0.6.1_2
@@ -620,14 +639,20 @@ replaces="
  python-nose<=1.3.7_7
  python-notify<=0.1.1_13
  python-numpy<=1.16.5_1
+ python-openssl<=20.0.1_2
  python-packaging<=20.4_2
  python-parsing<=2.4.7_2
  python-pathlib2<=2.3.4_6
+ python-pbr<=5.6.0_3
  python-pgpdump<=1.5_10
  python-pivy<=0.6.4_2
  python-pluggy<=0.13.1_2
+ python-ply<=3.11_7
  python-pretend<=1.0.9_5
  python-py<=1.10.0_1
+ python-pyasn1-modules<=0.2.8_6
+ python-pyasn1<=0.4.8_5
+ python-pycparser<=2.21_1
  python-pycryptodome<=3.9.7_3
  python-pydns<=2.3.6_4
  python-pyenet<=1.3.13.post7_2
@@ -644,8 +669,13 @@ replaces="
  python-rfc6555<=0.0.0_5
  python-scandir<=1.10.0_5
  python-selectors2<=2.0.2_2
+ python-service_identity<=18.1.0_7
+ python-six<=1.16.0_3
  python-spambayes<=1.1b3_3
+ python-sqlalchemy-migrate<=0.12.0_6
  python-sqlite<=2.8.3_1
+ python-sqlparse<=0.3.0_6
+ python-tempita<=0.5.2_8
  python-typing<=3.6.6_2
  python-unicorn>=0
  python-urllib3<=1.26.6_2
@@ -654,6 +684,7 @@ replaces="
  python-xdg<=0.27_2
  python-xlib<=0.29_1
  python-zipp<=1.2.0_2
+ python-zope.interface<=5.5.2_1
  python3-Django<=3.0.7_2
  python3-Flask-Assets<=0.12_9
  python3-Flask-Mail<=0.9.1_5

From 1431c9026d9f1950a209a1201562dc294975c1bb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:34:46 -0400
Subject: [PATCH 33/37] Manual.md: remove unnecessary python 2 documentation

---
 Manual.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Manual.md b/Manual.md
index a8d19d1439dda1..6d9a0e6289fd71 100644
--- a/Manual.md
+++ b/Manual.md
@@ -207,7 +207,7 @@ a package providing the executable named `<name>` and the module named
 language prefix can be dropped. Short names for languages are no valid substitute
 for the language prefix.
 
-Example: python-pam, perl-URI, python3-pyside2
+Example: perl-URI, python3-pyside2
 
 <a id="language_bindings"></a>
 #### Language Bindings
@@ -220,7 +220,7 @@ The naming convention to those packages is:
 <name>-<language>
 ```
 
-Example: gimp-python, irssi-perl
+Example: gimp-python3, irssi-perl
 
 <a id="programs"></a>
 #### Programs
@@ -597,9 +597,9 @@ build methods. By default set to `check`.
 
 - `make_install_target` The installation target. When `${build_style}` is set to `configure`,
 `gnu-configure` or `gnu-makefile`, this is the target passed to `${make_command}` in the install
-phase; when unset, it defaults to `install`. If `${build_style}` is `python-pep517`, this is the
+phase; when unset, it defaults to `install`. If `${build_style}` is `python3-pep517`, this is the
 path of the Python wheel produced by the build phase that will be installed; when unset, the
-`python-pep517` build style will look for a wheel matching the package name and version in the
+`python3-pep517` build style will look for a wheel matching the package name and version in the
 current directory with respect to the install.
 
 - `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
@@ -1047,8 +1047,6 @@ Additional install arguments can be specified via `make_install_args`.
 
 - `waf3` For packages that use the Python3 `waf` build method with python3.
 
-- `waf` For packages that use the Python `waf` method with python2.
-
 - `slashpackage` For packages that use the /package hierarchy and package/compile to build,
 such as `daemontools` or any `djb` software.
 
@@ -1077,8 +1075,6 @@ system. Additional arguments may be passed to the `zig build` invocation using
 For packages that use the Python module build method (`setup.py` or
 [PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
 
-- `python2-module` to build Python 2.x modules
-
 - `python3-module` to build Python 3.x modules
 
 - `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
@@ -1599,7 +1595,7 @@ be your guidance to decide whether or not to split off a `-doc` subpackage.
 <a id="pkgs_python"></a>
 #### Python packages
 
-Python packages should be built with the `python{,2,3}-module` build style, if possible.
+Python packages should be built with the `python3-module` build style, if possible.
 This sets some environment variables required to allow cross compilation. Support to allow
 building a python module for multiple versions from a single template is also possible.
 The `python3-pep517` build style provides means to build python packages that provide a build-system
@@ -1624,7 +1620,7 @@ The following variables may influence how the python packages are built and conf
 at post-install time:
 
 - `pycompile_module`: By default, files and directories installed into
-`usr/lib/pythonX.X/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
+`usr/lib/pythonX.Y/site-packages`, excluding `*-info` and `*.so`, are byte-compiled
 at install time as python modules.  This variable expects subset of them that
 should be byte-compiled, if default is wrong.  Multiple python modules may be specified separated
 by blanks, Example: `pycompile_module="foo blah"`. If a python module installs a file into

From 8eee17448f593c8f2e10c35c1f7f675dab6f3acd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:21:57 -0400
Subject: [PATCH 34/37] common/build-style: remove waf build style

no longer needed by any packages, and should not ever be needed by any
new packages
---
 common/build-style/waf.sh | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 common/build-style/waf.sh

diff --git a/common/build-style/waf.sh b/common/build-style/waf.sh
deleted file mode 100644
index e943765f9b1797..00000000000000
--- a/common/build-style/waf.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This helper is for templates using WAF to build/install.
-#
-do_configure() {
-	: ${configure_script:=waf}
-
-	PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
-		--prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
-}
-
-do_build() {
-	: ${configure_script:=waf}
-
-	PYTHON=/usr/bin/python2 python2 ${configure_script} build ${make_build_args}
-}
-
-do_install() {
-	: ${configure_script:=waf}
-
-	PYTHON=/usr/bin/python2 python2 ${configure_script} install --destdir=${DESTDIR} ${make_install_args}
-}

From 5b1ca818396d602da0981093b0c1a98a0caad832 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:36:54 -0400
Subject: [PATCH 35/37] python-pip: rename to python2-pip

adopted by Leah at her request
---
 srcpkgs/python-pip                             |  1 +
 .../patches/no-versioned-pip.patch             |  0
 srcpkgs/{python-pip => python2-pip}/template   | 18 ++++++++++++------
 srcpkgs/{python-pip => python2-pip}/update     |  0
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/python-pip
 rename srcpkgs/{python-pip => python2-pip}/patches/no-versioned-pip.patch (100%)
 rename srcpkgs/{python-pip => python2-pip}/template (58%)
 rename srcpkgs/{python-pip => python2-pip}/update (100%)

diff --git a/srcpkgs/python-pip b/srcpkgs/python-pip
new file mode 120000
index 00000000000000..c63a33926675c8
--- /dev/null
+++ b/srcpkgs/python-pip
@@ -0,0 +1 @@
+python2-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python2-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python2-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python2-pip/template
similarity index 58%
rename from srcpkgs/python-pip/template
rename to srcpkgs/python2-pip/template
index 00d8875f2f9e2a..c3955779cd7c31 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python2-pip/template
@@ -1,12 +1,12 @@
-# Template file for 'python-pip'
-pkgname=python-pip
+# Template file for 'python2-pip'
+pkgname=python2-pip
 version=20.3.4
-revision=1
+revision=2
 build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
+hostmakedepends="python2-setuptools"
+depends="python2-setuptools"
 short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
@@ -17,3 +17,9 @@ post_install() {
 	vlicense LICENSE.txt
 	mv ${DESTDIR}/usr/bin/pip{,2}
 }
+
+python-pip_package() {
+	build_style=meta
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python2-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python2-pip/update

From 2497ab964d9db2bd1e156597bf0fa8dde0650d6d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:38:37 -0400
Subject: [PATCH 36/37] python-setuptools: rename to python2-setuptools

adopted by Leah at her request
---
 srcpkgs/python-setuptools                      |  1 +
 .../template                                   | 18 ++++++++++++------
 .../update                                     |  0
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/python-setuptools
 rename srcpkgs/{python-setuptools => python2-setuptools}/template (70%)
 rename srcpkgs/{python-setuptools => python2-setuptools}/update (100%)

diff --git a/srcpkgs/python-setuptools b/srcpkgs/python-setuptools
new file mode 120000
index 00000000000000..05923bd3cc80b0
--- /dev/null
+++ b/srcpkgs/python-setuptools
@@ -0,0 +1 @@
+python2-setuptools
\ No newline at end of file
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python2-setuptools/template
similarity index 70%
rename from srcpkgs/python-setuptools/template
rename to srcpkgs/python2-setuptools/template
index 5c5faa52fec451..a3c18827a7ecd0 100644
--- a/srcpkgs/python-setuptools/template
+++ b/srcpkgs/python2-setuptools/template
@@ -1,14 +1,14 @@
-# Template file for 'python-setuptools'
-pkgname=python-setuptools
+# Template file for 'python2-setuptools'
+pkgname=python2-setuptools
 # https://github.com/pypa/setuptools/issues/1458
 # python2 support for setuptools ended at 44.0.0
 version=44.0.0
-revision=2
+revision=3
 build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
+hostmakedepends="python2-devel"
+depends="python2"
 short_desc="Easily build and distribute Python2 packages"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/setuptools"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
@@ -24,3 +24,9 @@ post_install() {
 	vlicense LICENSE
 	mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install2
 }
+
+python-setuptools_package() {
+	build_style=meta
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/python-setuptools/update b/srcpkgs/python2-setuptools/update
similarity index 100%
rename from srcpkgs/python-setuptools/update
rename to srcpkgs/python2-setuptools/update

From d8674878462d4ce35d5e24c8185e693c3460e684 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Sep 2024 04:39:10 -0400
Subject: [PATCH 37/37] python: rename to python2, convert to metapackage

metapackage points at 2.7 for now, but will change at a later date

closes #38229
---
 srcpkgs/python-tkinter/update                 |   1 -
 srcpkgs/python/INSTALL.msg                    |   2 +
 srcpkgs/python/template                       | 116 ++----------------
 srcpkgs/python2-devel                         |   1 +
 .../files/cross.patch                         |   0
 .../files/idle2.desktop                       |   0
 .../files/idle2.xpm                           |   0
 .../template                                  |   8 +-
 srcpkgs/python2-tkinter/update                |   1 +
 srcpkgs/{python => python2}/files/cross.patch |   0
 .../patches/fix-i686-rlock.patch              |   0
 .../patches/musl-find_library.patch           |   0
 .../patches/sysconfig.patch                   |   0
 srcpkgs/python2/template                      | 116 ++++++++++++++++++
 srcpkgs/{python => python2}/update            |   0
 15 files changed, 133 insertions(+), 112 deletions(-)
 delete mode 120000 srcpkgs/python-tkinter/update
 create mode 100644 srcpkgs/python/INSTALL.msg
 create mode 120000 srcpkgs/python2-devel
 rename srcpkgs/{python-tkinter => python2-tkinter}/files/cross.patch (100%)
 rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.desktop (100%)
 rename srcpkgs/{python-tkinter => python2-tkinter}/files/idle2.xpm (100%)
 rename srcpkgs/{python-tkinter => python2-tkinter}/template (92%)
 create mode 120000 srcpkgs/python2-tkinter/update
 rename srcpkgs/{python => python2}/files/cross.patch (100%)
 rename srcpkgs/{python => python2}/patches/fix-i686-rlock.patch (100%)
 rename srcpkgs/{python => python2}/patches/musl-find_library.patch (100%)
 rename srcpkgs/{python => python2}/patches/sysconfig.patch (100%)
 create mode 100644 srcpkgs/python2/template
 rename srcpkgs/{python => python2}/update (100%)

diff --git a/srcpkgs/python-tkinter/update b/srcpkgs/python-tkinter/update
deleted file mode 120000
index 468ac2c4f9c052..00000000000000
--- a/srcpkgs/python-tkinter/update
+++ /dev/null
@@ -1 +0,0 @@
-../python/update
\ No newline at end of file
diff --git a/srcpkgs/python/INSTALL.msg b/srcpkgs/python/INSTALL.msg
new file mode 100644
index 00000000000000..c601330e59e94d
--- /dev/null
+++ b/srcpkgs/python/INSTALL.msg
@@ -0,0 +1,2 @@
+This package will install python3 soon. If you wish to keep Python 2,
+mark python2 as manually installed with xbps-pkgdb(1).
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 57e2d76db0a905..c7d9066c75813b 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,114 +1,16 @@
 # Template file for 'python'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
 pkgname=python
-version=2.7.18.9
-revision=2
-_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
-pycompile_dirs="usr/lib/python2.7"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
-depends="ca-certificates"
-short_desc="Interpreted, interactive, object-oriented programming language"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
+version=2.7.9999
+revision=1
+build_style=meta
+depends="python${version%%.*}"
+short_desc="Python programming language (metapackage)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Public Domain"
 homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
-checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
-
-alternatives="
- python:idle:/usr/bin/idle2.7
- python:2to3:/usr/bin/2to3-2.7
- python:pydoc:/usr/bin/pydoc2.7
- python:python:/usr/bin/python2.7
- python:python.1:/usr/share/man/man1/python2.7.1"
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
-	makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat
-	rm -r Modules/_ctypes/libffi*
-	# Enable loading sqlite extensions.
-	vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
-	local _args
-	unset GCC CC CXX CPP LD AR AS RANLIB
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p host-build
-		cd host-build
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
-		mkdir -p ../hostpython
-		mv python ../hostpython
-		cd ..
-		patch -Np0 -i ${FILESDIR}/cross.patch
-		_args="--build=${XBPS_MACHINE%%-musl}"
-	fi
-	./configure ${configure_args} ${_args} \
-		--enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
-		--with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
-		--with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
-	export PATH="$PATH:$wrksrc/hostpython"
-	export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
-	make ${makejobs}
-}
-
-do_install() {
-	export PATH="$PATH:$wrksrc/hostpython"
-	make DESTDIR=${DESTDIR} altinstall
-	ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
-	ln -sf python2.7 ${DESTDIR}/usr/bin/python2
-	ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
-	ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
-	ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
-	ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
-}
-
-post_install() {
-	chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
-	vlicense LICENSE
-	rm -f ${DESTDIR}/usr/bin/smtpd.py
-	mv ${DESTDIR}/usr/bin/2to3{,-2.7}
-	mv ${DESTDIR}/usr/bin/pydoc{,2.7}
-	# Remove files that belong to python-tkinter and idle-python
-	rm ${DESTDIR}/usr/bin/idle
-	rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
-	rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
-	# Remove test module and tests that fail to be byte-compiled.
-	rm -r ${DESTDIR}/usr/lib/python2.7/test
-	rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
-	# Remove references to the install(1) wrapper.
-	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
-		${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
-		${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
-	if [ "$CROSS_BUILD" ]; then
-		# Remove references to cross toolchain.
-		vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
-			${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
-			${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
-	fi
-}
 
 python-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="python${version%%.*}-devel"
 	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/python*-config
-		vmove usr/lib/pkgconfig
-		vmove usr/include
-		vmove usr/lib/python2.7/config/libpython2.7.a
-		mkdir -p ${DESTDIR}/usr/include/python2.7
-		mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
-			${DESTDIR}/usr/include/python2.7
-	}
+	build_style=meta
 }
diff --git a/srcpkgs/python2-devel b/srcpkgs/python2-devel
new file mode 120000
index 00000000000000..551ab268585033
--- /dev/null
+++ b/srcpkgs/python2-devel
@@ -0,0 +1 @@
+python2
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python2-tkinter/files/cross.patch
similarity index 100%
rename from srcpkgs/python-tkinter/files/cross.patch
rename to srcpkgs/python2-tkinter/files/cross.patch
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python2-tkinter/files/idle2.desktop
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.desktop
rename to srcpkgs/python2-tkinter/files/idle2.desktop
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python2-tkinter/files/idle2.xpm
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.xpm
rename to srcpkgs/python2-tkinter/files/idle2.xpm
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python2-tkinter/template
similarity index 92%
rename from srcpkgs/python-tkinter/template
rename to srcpkgs/python2-tkinter/template
index 37f263262aa4e0..75de19834d0a0d 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python2-tkinter/template
@@ -1,12 +1,12 @@
-# Template file for 'python-tkinter'
+# Template file for 'python2-tkinter'
 #
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2"; IT IS SPLITTED TO AVOID
+# A CYCLIC DEPENDENCY: python2 -> tk -> libX11 -> libxcb -> xcb-proto -> python2
 #
 
 _desc="Interpreted, interactive, object-oriented programming language"
 
-pkgname=python-tkinter
+pkgname=python2-tkinter
 version=2.7.18.9
 revision=2
 _commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
diff --git a/srcpkgs/python2-tkinter/update b/srcpkgs/python2-tkinter/update
new file mode 120000
index 00000000000000..b29540d8f73a12
--- /dev/null
+++ b/srcpkgs/python2-tkinter/update
@@ -0,0 +1 @@
+../python2/update
\ No newline at end of file
diff --git a/srcpkgs/python/files/cross.patch b/srcpkgs/python2/files/cross.patch
similarity index 100%
rename from srcpkgs/python/files/cross.patch
rename to srcpkgs/python2/files/cross.patch
diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python2/patches/fix-i686-rlock.patch
similarity index 100%
rename from srcpkgs/python/patches/fix-i686-rlock.patch
rename to srcpkgs/python2/patches/fix-i686-rlock.patch
diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python2/patches/musl-find_library.patch
similarity index 100%
rename from srcpkgs/python/patches/musl-find_library.patch
rename to srcpkgs/python2/patches/musl-find_library.patch
diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python2/patches/sysconfig.patch
similarity index 100%
rename from srcpkgs/python/patches/sysconfig.patch
rename to srcpkgs/python2/patches/sysconfig.patch
diff --git a/srcpkgs/python2/template b/srcpkgs/python2/template
new file mode 100644
index 00000000000000..4d2b2336cdc91d
--- /dev/null
+++ b/srcpkgs/python2/template
@@ -0,0 +1,116 @@
+# Template file for 'python2'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python2-tkinter".
+#
+pkgname=python2
+version=2.7.18.9
+revision=2
+_commit=76f11e17a26f8cc28f8336303b26cb503710fa7d
+pycompile_dirs="usr/lib/python2.7"
+hostmakedepends="pkg-config"
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
+ sqlite-devel bzip2-devel zlib-devel"
+depends="ca-certificates"
+short_desc="Interpreted, interactive, object-oriented programming language"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Python-2.0"
+homepage="https://www.python.org"
+distfiles="https://github.com/ActiveState/cpython/archive/${_commit}.tar.gz"
+checksum=1297e71396f5b58404157d9c6ebf5ac49dddcbad098ecda9d72570f5c7d207e4
+
+short_desc+=" (limited install; not for regular use)"
+
+alternatives="
+ python:idle:/usr/bin/idle2.7
+ python:2to3:/usr/bin/2to3-2.7
+ python:pydoc:/usr/bin/pydoc2.7
+ python:python:/usr/bin/python2.7
+ python:python.1:/usr/share/man/man1/python2.7.1"
+
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
+pre_configure() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat
+	rm -r Modules/_ctypes/libffi*
+	# Enable loading sqlite extensions.
+	vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
+}
+
+do_configure() {
+	local _args
+	unset GCC CC CXX CPP LD AR AS RANLIB
+	if [ "$CROSS_BUILD" ]; then
+		mkdir -p host-build
+		cd host-build
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
+		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
+		mkdir -p ../hostpython
+		mv python ../hostpython
+		cd ..
+		patch -Np0 -i ${FILESDIR}/cross.patch
+		_args="--build=${XBPS_MACHINE%%-musl}"
+	fi
+	./configure ${configure_args} ${_args} \
+		--enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
+		--with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
+		--with-system-expat --with-system-ffi --without-ensurepip
+}
+
+do_build() {
+	export PATH="$PATH:$wrksrc/hostpython"
+	export AS_DEPENDENCIES_DIR="${XBPS_CROSS_BASE}/"
+	make ${makejobs}
+}
+
+do_install() {
+	export PATH="$PATH:$wrksrc/hostpython"
+	make DESTDIR=${DESTDIR} altinstall
+	ln -sf pydoc2.7 ${DESTDIR}/usr/bin/pydoc2
+	ln -sf python2.7 ${DESTDIR}/usr/bin/python2
+	ln -sf python2.7-config ${DESTDIR}/usr/bin/python-config
+	ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
+	ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
+	ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
+}
+
+post_install() {
+	chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
+	vlicense LICENSE
+	rm -f ${DESTDIR}/usr/bin/smtpd.py
+	mv ${DESTDIR}/usr/bin/2to3{,-2.7}
+	mv ${DESTDIR}/usr/bin/pydoc{,2.7}
+	# Remove files that belong to python-tkinter and idle-python
+	rm ${DESTDIR}/usr/bin/idle
+	rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
+	rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
+	# Remove test module and tests that fail to be byte-compiled.
+	rm -r ${DESTDIR}/usr/lib/python2.7/test
+	rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
+	# Remove references to the install(1) wrapper.
+	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
+		${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+		${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+	if [ "$CROSS_BUILD" ]; then
+		# Remove references to cross toolchain.
+		vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
+			${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
+			${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+	fi
+}
+
+python2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/python*-config
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/lib/python2.7/config/libpython2.7.a
+		mkdir -p ${DESTDIR}/usr/include/python2.7
+		mv ${PKGDESTDIR}/usr/include/python2.7/pyconfig.h \
+			${DESTDIR}/usr/include/python2.7
+	}
+}
diff --git a/srcpkgs/python/update b/srcpkgs/python2/update
similarity index 100%
rename from srcpkgs/python/update
rename to srcpkgs/python2/update