From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [NOMERGE] buildbot, deps, python 2: remove
Date: Thu, 18 Apr 2024 02:18:52 +0200 [thread overview]
Message-ID: <20240418001852.8609621570@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38731@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages buildbot
https://github.com/void-linux/void-packages/pull/38731
[NOMERGE] buildbot, deps, python 2: remove
## ! This should not be merged until the necessary infra changes happen !
Removes buildbot and all python2 dependencies in the dependency tree that became unused as a result.
as buildbot is the last remaining blocker of the python 2 removal project, it is also removed here
A patch file from https://github.com/void-linux/void-packages/pull/38731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-buildbot-38731.patch --]
[-- Type: text/x-diff, Size: 89832 bytes --]
From b09cea33f0915ae31a3f97856b1338d9d8ff6043 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:33 -0400
Subject: [PATCH 01/38] 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 13212d0f8be9f3dfa6f79c2890510e0c6e4b73b4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:22:46 -0400
Subject: [PATCH 02/38] 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 bcd5267a93200db1ad96735f249f07469a6a24c0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:11 -0400
Subject: [PATCH 03/38] 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 422198794939fb0122198599bd77d09ca575267b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:21 -0400
Subject: [PATCH 04/38] 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 bc7a4284932fb2c431fa1014c611a7ba2ed47cda Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:44 -0400
Subject: [PATCH 05/38] 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 80980fe1eba15c915e9d4f5eb97999e8d3167bf9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:23:58 -0400
Subject: [PATCH 06/38] 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 471ce62f9f65cbd9592d5a4b4e90b86c8634e381 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:17 -0400
Subject: [PATCH 07/38] 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 dac53d315e2fa0d3bf2ebd4f6f0e65d70a282de6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:34 -0400
Subject: [PATCH 08/38] 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 a402937aa3379214faeb3fdc5366447d0697e9c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:24:54 -0400
Subject: [PATCH 09/38] 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 43a4bf426a33e7ef9026688187050018e653d39d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:05 -0400
Subject: [PATCH 10/38] 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 aeb0e486fa293abf93fd0f89c299e28c60db8438 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:25:58 -0400
Subject: [PATCH 11/38] 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 029255ed87cffc6de7bedd1d8784bccc0af4ee1d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:25 -0400
Subject: [PATCH 12/38] 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 7760931e8a1cec7aad0d65fd0c3b8912a6be4bcf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:43 -0400
Subject: [PATCH 13/38] 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 1e43228129d0d3739a78a883774a772d9393b4de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:49 -0400
Subject: [PATCH 14/38] 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 300ea7d56a945ed5ff4db9f9f21e04bed6bd3de3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:28:58 -0400
Subject: [PATCH 15/38] 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 f471ec897ef4fd76a9c81414bba5c4e76d166d23 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:09 -0400
Subject: [PATCH 16/38] 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 b80e6c81bad559055abaa067c0c3d458ae056f9e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:25 -0400
Subject: [PATCH 17/38] 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 e2a2426d0b5dbfa6deb060b5166c55229bd45ae0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:37 -0400
Subject: [PATCH 18/38] 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 9036c314ae13ab49453903c726653344b96c872a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:46 -0400
Subject: [PATCH 19/38] 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 e95058d3f604ee440fec95dd6cdcc8ba2ba5ec61 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:29:59 -0400
Subject: [PATCH 20/38] 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 d41e7d4bdb91fe6108e1e43e50083c12a7325801 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:31 -0400
Subject: [PATCH 21/38] 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 bfa758554dbac635d8a2cb816827aa785f9ae68b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:37 -0400
Subject: [PATCH 22/38] 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 812331d3182a0c0270bdd86d51e631ff0749de31 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:30:46 -0400
Subject: [PATCH 23/38] 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 220c03c587927d255727aee3263d942a2e11a6d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:09 -0400
Subject: [PATCH 24/38] 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 fbec137c8675a4e55a4728734c98a6a37f9c45cd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:22 -0400
Subject: [PATCH 25/38] python-cffi: remove
python 2
---
srcpkgs/python-cffi/template | 19 -------------------
srcpkgs/python-cffi/update | 1 -
2 files changed, 20 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 949f6d6222c906..00000000000000
--- a/srcpkgs/python-cffi/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-cffi'
-pkgname=python-cffi
-version=1.16.0
-revision=1
-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="Andrew J. Hesford <ajh@sideband.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=bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0
-
-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 8df9e2fc66a0742c4a32c6437a8dcbccb380ada1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:34 -0400
Subject: [PATCH 26/38] 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 4f77a2de0db8b5d51b82789eff34be93d19a17c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:40 -0400
Subject: [PATCH 27/38] 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 681f34727bd5c886bcd5d8bae5cac054b42058d8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:31:50 -0400
Subject: [PATCH 28/38] 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 162e648a2b50e3325a2064df786911ba2c698d33 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:01 -0400
Subject: [PATCH 29/38] 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 5821bf4a58f0c5df6479ef0e299b18739f0ca631 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:07 -0400
Subject: [PATCH 30/38] 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 50c1415d55bc8ae7d0c26e37319902d909bbc512 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:32:16 -0400
Subject: [PATCH 31/38] 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 2260b1226e956e6e485b7e0d9e5249514fc163c9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 11 Oct 2023 17:44:53 -0400
Subject: [PATCH 32/38] 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 a9821553808851..c8ea52100bc2d3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -46,6 +46,8 @@ replaces="
bitcoin<=22.0_5
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
@@ -515,29 +517,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
@@ -545,8 +560,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
@@ -561,14 +580,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
@@ -585,8 +610,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
@@ -595,6 +625,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 7a19d1b4154dd63dc8dc3cfdf1274bce227b1866 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:42:56 -0400
Subject: [PATCH 33/38] python-pip: remove
python2
---
.../python-pip/patches/no-versioned-pip.patch | 13 -------------
srcpkgs/python-pip/template | 19 -------------------
srcpkgs/python-pip/update | 2 --
3 files changed, 34 deletions(-)
delete mode 100644 srcpkgs/python-pip/patches/no-versioned-pip.patch
delete mode 100644 srcpkgs/python-pip/template
delete mode 100644 srcpkgs/python-pip/update
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python-pip/patches/no-versioned-pip.patch
deleted file mode 100644
index 17c0a38d434d2b..00000000000000
--- a/srcpkgs/python-pip/patches/no-versioned-pip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -75,10 +75,6 @@
- entry_points={
- "console_scripts": [
- "pip=pip._internal.cli.main:main",
-- "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
-- "pip{}.{}=pip._internal.cli.main:main".format(
-- *sys.version_info[:2]
-- ),
- ],
- },
-
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index 00d8875f2f9e2a..00000000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.3.4
-revision=1
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc
-
-post_install() {
- vlicense LICENSE.txt
- mv ${DESTDIR}/usr/bin/pip{,2}
-}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python-pip/update
deleted file mode 100644
index 88ebcc780cfc3f..00000000000000
--- a/srcpkgs/python-pip/update
+++ /dev/null
@@ -1,2 +0,0 @@
-# Support for Python 2 was dropped in pip >= 21
-pattern='pip-\K20\.[0-9.]+(?=.tar.gz)'
From e43243d61fcad85e9f78bda4970c38e4584d6095 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:43:37 -0400
Subject: [PATCH 34/38] python-setuptools: remove
python 2
---
srcpkgs/python-setuptools/template | 26 --------------------------
srcpkgs/python-setuptools/update | 1 -
2 files changed, 27 deletions(-)
delete mode 100644 srcpkgs/python-setuptools/template
delete mode 100644 srcpkgs/python-setuptools/update
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template
deleted file mode 100644
index 5c5faa52fec451..00000000000000
--- a/srcpkgs/python-setuptools/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setuptools'
-pkgname=python-setuptools
-# https://github.com/pypa/setuptools/issues/1458
-# python2 support for setuptools ended at 44.0.0
-version=44.0.0
-revision=2
-build_style=python2-module
-hostmakedepends="python-devel"
-depends="python"
-short_desc="Easily build and distribute Python2 packages"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/pypa/setuptools"
-distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.zip"
-checksum=e5baf7723e5bb8382fc146e33032b241efc63314211a3a120aaa55d62d2bb008
-alternatives="setuptools:easy_install:/usr/bin/easy_install2"
-provides="python-distribute-${version}_1"
-replaces="python-distribute>=0"
-
-export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
-export SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-
-post_install() {
- vlicense LICENSE
- mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install2
-}
diff --git a/srcpkgs/python-setuptools/update b/srcpkgs/python-setuptools/update
deleted file mode 100644
index 5d1cf3e06f1a78..00000000000000
--- a/srcpkgs/python-setuptools/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="44\.[\d]+\.[\d]+"
From dd6aac018c0de15d387d8e325940db904810a63d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:42:32 -0400
Subject: [PATCH 35/38] python-tkinter: remove
python2
---
srcpkgs/idle-python | 1 -
srcpkgs/python-tkinter/files/cross.patch | 1 -
srcpkgs/python-tkinter/files/idle2.desktop | 9 --
srcpkgs/python-tkinter/files/idle2.xpm | 124 ---------------------
srcpkgs/python-tkinter/template | 91 ---------------
srcpkgs/python-tkinter/update | 1 -
6 files changed, 227 deletions(-)
delete mode 120000 srcpkgs/idle-python
delete mode 120000 srcpkgs/python-tkinter/files/cross.patch
delete mode 100644 srcpkgs/python-tkinter/files/idle2.desktop
delete mode 100644 srcpkgs/python-tkinter/files/idle2.xpm
delete mode 100644 srcpkgs/python-tkinter/template
delete mode 120000 srcpkgs/python-tkinter/update
diff --git a/srcpkgs/idle-python b/srcpkgs/idle-python
deleted file mode 120000
index 0d091609e96672..00000000000000
--- a/srcpkgs/idle-python
+++ /dev/null
@@ -1 +0,0 @@
-python-tkinter
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python-tkinter/files/cross.patch
deleted file mode 120000
index c27b8a16c11313..00000000000000
--- a/srcpkgs/python-tkinter/files/cross.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../python/files/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python-tkinter/files/idle2.desktop
deleted file mode 100644
index ee6fad11773669..00000000000000
--- a/srcpkgs/python-tkinter/files/idle2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=IDLE (using Python2)
-Comment=IDE for Python (using Python2)
-Exec=idle2
-Icon=idle2
-Terminal=false
-Type=Application
-Categories=Development;
-StartupNotify=true
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python-tkinter/files/idle2.xpm
deleted file mode 100644
index 964cbefdeb3dd5..00000000000000
--- a/srcpkgs/python-tkinter/files/idle2.xpm
+++ /dev/null
@@ -1,124 +0,0 @@
-/* XPM */
-static char *python[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 102 2 ",
-" c #EBBB18",
-". c #EBBE21",
-"X c #F3C11A",
-"o c #FAC719",
-"O c #FDCB1B",
-"+ c #FFCC1C",
-"@ c #EBC22A",
-"# c #FFCF23",
-"$ c #FFCF24",
-"% c #FFD025",
-"& c #FFD026",
-"* c #FFD32D",
-"= c #FDD22F",
-"- c #FFD32E",
-"; c #FFD32F",
-": c #EBC534",
-"> c #E8C73D",
-", c #FFD330",
-"< c #FFD430",
-"1 c #FDD536",
-"2 c #FFD637",
-"3 c #FAD339",
-"4 c #FFD738",
-"5 c #FFD739",
-"6 c #FFD73A",
-"7 c #F9D53E",
-"8 c #FFD83A",
-"9 c #ECCE45",
-"0 c #FDD941",
-"q c #FFDA41",
-"w c #FFDA42",
-"e c #FFDB42",
-"r c #FFDB43",
-"t c #FFDB44",
-"y c #FDDD4A",
-"u c #FFDE4B",
-"i c #FFDF4D",
-"p c #FDDE4E",
-"a c #FFDF4E",
-"s c #FFE255",
-"d c #FFE357",
-"f c #FFE358",
-"g c #FFE661",
-"h c #FFE761",
-"j c #FFE762",
-"k c #F2E16E",
-"l c #F5E36F",
-"z c #FDE96A",
-"x c #FFEB6C",
-"c c #326087",
-"v c #366690",
-"b c #366791",
-"n c #356892",
-"m c #366993",
-"M c #366994",
-"N c #376896",
-"B c #376A96",
-"V c #396C96",
-"C c #386C97",
-"Z c #396D99",
-"A c #3A6F9B",
-"S c #3A709C",
-"D c #3B709C",
-"F c #3B709D",
-"G c #3C719E",
-"H c #3D73A0",
-"J c #3D73A2",
-"K c #3D74A1",
-"L c #3E74A2",
-"P c #3E75A3",
-"I c #3F76A5",
-"U c #4078A6",
-"Y c #4078A7",
-"T c #4179A8",
-"R c #427BAA",
-"E c #437CAB",
-"W c #437DAD",
-"Q c #437DAE",
-"! c #447DAD",
-"~ c #447EAD",
-"^ c #457FAF",
-"/ c #4680B0",
-"( c #4680B1",
-") c #4681B2",
-"_ c #4781B2",
-"` c #4883B4",
-"' c #4884B5",
-"] c #4885B6",
-"[ c #4985B7",
-"{ c #4A87B9",
-"} c #4A86BA",
-"| c #4B88BB",
-" . c #4C89BC",
-".. c #4C8ABC",
-"X. c #4D8BBE",
-"o. c #4C8ABF",
-"O. c #4E8DC0",
-"+. c #4F8DC1",
-"@. c #508FC3",
-"#. c #5291C6",
-"$. c gray100",
-"%. c None",
-/* pixels */
-"%.%.%.%.+.} ( W I G N %.%.%.%.%.",
-"%.%.%.%...$.( R L S B %.%.%.%.%.",
-"%.%.%.%.] ( R L D B m %.%.%.%.%.",
-"%.%.o.] W L V v V B B %.%.%.%.%.",
-"#.+. .` ^ U G A m B B %.s u 7 %.",
-"@.o._ ^ R G A m m m c %.u q 1 %.",
-"o.] _ R L G B B n c %.9 q 1 * %.",
-"] _ E U m %.%.%.%.%.%.q 5 * # %.",
-"( E U n %.k z j s a t 5 * $ O %.",
-"W R K %.l x j f a t 5 * $ + X %.",
-"%.K D %.x j f a q 8 * $ + + %.%.",
-"%.%.%.%.j f a > : @ . %.%.%.",
-"%.%.%.%.f a t 5 , % + %.%.%.%.%.",
-"%.%.%.%.a t 5 < % $.O %.%.%.%.%.",
-"%.%.%.%.%.3 , % + o %.%.%.%.%.%.",
-"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%."
-};
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
deleted file mode 100644
index 1f6c0d0ce627d7..00000000000000
--- a/srcpkgs/python-tkinter/template
+++ /dev/null
@@ -1,91 +0,0 @@
-# Template file for 'python-tkinter'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
-#
-
-_desc="Interpreted, interactive, object-oriented programming language"
-
-pkgname=python-tkinter
-version=2.7.18.7
-revision=2
-_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
-pycompile_dirs="usr/lib/python2.7/lib-tk"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel tk-devel"
-short_desc="${_desc} - GUI toolkit for Python2"
-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=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
- makedepends+=" libxcrypt-devel"
-fi
-
-pre_configure() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- rm -r Modules/zlib
- # Enable loading sqlite extensions.
- vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
- 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
- fi
- ./configure ${configure_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"
- make ${makejobs}
-}
-
-do_install() {
- export PATH="$PATH:$wrksrc/hostpython"
-
- mkdir -p ${wrksrc}/tmp-destdir/usr/lib
- ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE}
-
- make DESTDIR=${wrksrc}/tmp-destdir altinstall
-
- # We only care for the idle and tk modules.
- vmkdir usr/bin
- vmkdir usr/lib/python2.7/lib-dynload
- mv ${wrksrc}/tmp-destdir/usr/bin/idle ${DESTDIR}/usr/bin/idle2.7
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/idlelib \
- ${DESTDIR}/usr/lib/python2.7/
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-tk \
- ${DESTDIR}/usr/lib/python2.7/
- mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-dynload/_tkinter.so \
- ${DESTDIR}/usr/lib/python2.7/lib-dynload/
- ln -sf idle2.7 ${DESTDIR}/usr/bin/idle2
-}
-
-idle-python_package() {
- short_desc="${_desc} - IDE for Python2 using Tkinter"
- pycompile_dirs="usr/lib/python2.7/idlelib"
- depends="${sourcepkg}-${version}_${revision}"
- pkg_install() {
- vmove usr/bin/idle2*
- vmove usr/lib/python2.7/idlelib
- vinstall ${FILESDIR}/idle2.xpm 644 usr/share/pixmaps
- vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications
- }
-}
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
From bd15ddb1ca4c427c23804bba720dec0fa25516cb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Oct 2023 12:41:55 -0400
Subject: [PATCH 36/38] python: remove
closes #38229
---
srcpkgs/python-devel | 1 -
srcpkgs/python/files/cross.patch | 88 --------------
srcpkgs/python/patches/fix-i686-rlock.patch | 55 ---------
srcpkgs/python/patches/fix-pr-21.patch | 17 ---
.../python/patches/musl-find_library.patch | 44 -------
srcpkgs/python/patches/sysconfig.patch | 22 ----
srcpkgs/python/template | 114 ------------------
srcpkgs/python/update | 1 -
srcpkgs/removed-packages/template | 14 ++-
9 files changed, 10 insertions(+), 346 deletions(-)
delete mode 120000 srcpkgs/python-devel
delete mode 100644 srcpkgs/python/files/cross.patch
delete mode 100644 srcpkgs/python/patches/fix-i686-rlock.patch
delete mode 100644 srcpkgs/python/patches/fix-pr-21.patch
delete mode 100644 srcpkgs/python/patches/musl-find_library.patch
delete mode 100644 srcpkgs/python/patches/sysconfig.patch
delete mode 100644 srcpkgs/python/template
delete mode 100644 srcpkgs/python/update
diff --git a/srcpkgs/python-devel b/srcpkgs/python-devel
deleted file mode 120000
index d8654aa0e2f2f3..00000000000000
--- a/srcpkgs/python-devel
+++ /dev/null
@@ -1 +0,0 @@
-python
\ No newline at end of file
diff --git a/srcpkgs/python/files/cross.patch b/srcpkgs/python/files/cross.patch
deleted file mode 100644
index 04a20a75dad792..00000000000000
--- a/srcpkgs/python/files/cross.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -1000,12 +1002,12 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- $(DESTDIR)$(LIBDEST)/distutils/tests ; \
- fi
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- $(DESTDIR)$(LIBDEST)
-- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-@@ -1133,11 +1135,13 @@ libainstall: all python-config
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
-+ CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
-+ --skip-build \
- --prefix=$(prefix) \
-- --install-scripts=$(BINDIR) \
-- --install-platlib=$(DESTSHARED) \
-- --root=$(DESTDIR)/
-+ --install-scripts=$(DESTDIR)$(BINDIR) \
-+ --install-platlib=$(DESTDIR)$(DESTSHARED) \
-+ --root=/
- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py*
-
- # Here are a couple of targets for MacOSX again, to install a full
---- setup.py.orig 2013-11-10 08:36:41.000000000 +0100
-+++ setup.py 2013-11-18 21:27:27.222000786 +0100
-@@ -17,7 +17,7 @@ from distutils.command.install import in
- from distutils.command.install_lib import install_lib
- from distutils.spawn import find_executable
-
--cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
-+cross_compiling = ("_PYTHON_HOST_PLATFORM" in os.environ) or ('PYTHONXCPREFIX' in os.environ)
-
- def get_platform():
- # cross build
-@@ -324,6 +324,9 @@ class PyBuildExt(build_ext):
-
- # Don't try to load extensions for cross builds
- if cross_compiling:
-+ self.announce(
-+ 'WARNING: skipping import check for cross-compiled: "%s"' %
-+ ext.name)
- return
-
- try:
-@@ -478,7 +481,7 @@ class PyBuildExt(build_ext):
- for directory in reversed(options.dirs):
- add_dir_to_list(dir_list, directory)
-
-- if os.path.normpath(sys.prefix) != '/usr' \
-+ if os.path.normpath(sys.prefix) != '/usr' and not cross_compiling \
- and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
- # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
- # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-@@ -554,6 +557,11 @@ class PyBuildExt(build_ext):
- if host_platform in ['darwin', 'beos']:
- math_libs = []
-
-+ # Insert libraries and headers from XBPS_CROSS_BASE
-+ if 'XBPS_CROSS_BASE' in os.environ:
-+ lib_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/lib']
-+ inc_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/include']
-+
- # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-
- #
-@@ -2020,6 +2028,11 @@ class PyBuildExt(build_ext):
-
- # Pass empty CFLAGS because we'll just append the resulting
- # CFLAGS to Python's; -g or -O2 is to be avoided.
-+ if cross_compiling:
-+ cmd = "cd %s && env CFLAGS='' '%s/configure' --host=%s --build=%s %s" \
-+ % (ffi_builddir, ffi_srcdir, os.environ.get('HOSTARCH'),
-+ os.environ.get('BUILDARCH'), " ".join(config_args))
-+ else:
- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
-
diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python/patches/fix-i686-rlock.patch
deleted file mode 100644
index 94e5567bece90c..00000000000000
--- a/srcpkgs/python/patches/fix-i686-rlock.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-It seems that avoiding to create local aliases for the self._rlock and
-self._wlock methods prevents the strange errors on i686 related to
-semaphore locking and unlocking.
-
-One example of failing builds is firefox-esr running gyp in an i686 environment.
-
---- a/Lib/multiprocessing/queues.py 2017-09-16 19:38:35.000000000 +0200
-+++ b/Lib/multiprocessing/queues.py 2017-10-24 19:49:06.291351206 +0200
-@@ -369,13 +369,11 @@
-
- def _make_methods(self):
-- recv = self._reader.recv
-- racquire, rrelease = self._rlock.acquire, self._rlock.release
- def get():
-- racquire()
-- try:
-- return recv()
-- finally:
-- rrelease()
-+ self._rlock.acquire()
-+ try:
-+ return self._reader.recv()
-+ finally:
-+ self._rlock.release()
- self.get = get
-
- if self._wlock is None:
-@@ -383,11 +382,9 @@
- self.put = self._writer.send
- else:
-- send = self._writer.send
-- wacquire, wrelease = self._wlock.acquire, self._wlock.release
- def put(obj):
-- wacquire()
-- try:
-- return send(obj)
-- finally:
-- wrelease()
-+ self._wlock.acquire()
-+ try:
-+ return self._writer.send(obj)
-+ finally:
-+ self._wlock.release()
- self.put = put
---- a/Modules/_multiprocessing/semaphore.c 2017-09-16 19:38:35.000000000 +0200
-+++ b/Modules/_multiprocessing/semaphore.c 2017-10-28 10:49:56.944993401 +0200
-@@ -378,7 +378,7 @@
- }
- }
- #else
-- int sval;
-+ int sval = -1;
-
- /* This check is not an absolute guarantee that the semaphore
- does not rise above maxvalue. */
diff --git a/srcpkgs/python/patches/fix-pr-21.patch b/srcpkgs/python/patches/fix-pr-21.patch
deleted file mode 100644
index e1e5b771e79a16..00000000000000
--- a/srcpkgs/python/patches/fix-pr-21.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Include/pyport.h
-+++ b/Include/pyport.h
-@@ -947,7 +947,6 @@
- #define Py_ULL(x) Py_LL(x##U)
- #endif
-
--#ifdef Py_BUILD_CORE
- /*
- * Macros to protect CRT calls against instant termination when passed an
- * invalid parameter (issue23524).
-@@ -965,6 +964,5 @@
- #define _Py_END_SUPPRESS_IPH
-
- #endif /* _MSC_VER >= 1900 */
--#endif /* Py_BUILD_CORE */
-
- #endif /* Py_PYPORT_H */
diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python/patches/musl-find_library.patch
deleted file mode 100644
index 82f436b4072bd8..00000000000000
--- a/srcpkgs/python/patches/musl-find_library.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -204,6 +204,41 @@
- def find_library(name, is64 = False):
- return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
-
-+ elif True:
-+
-+ # Patched for Alpine Linux / musl - search manually system paths
-+ def _is_elf(filepath):
-+ try:
-+ with open(filepath, 'rb') as fh:
-+ return fh.read(4) == b'\x7fELF'
-+ except:
-+ return False
-+
-+ def find_library(name):
-+ from glob import glob
-+ # absolute name?
-+ if os.path.isabs(name):
-+ return name
-+ # special case for libm, libcrypt and libpthread and musl
-+ if name in ['m', 'crypt', 'pthread']:
-+ name = 'c'
-+ elif name in ['libm.so', 'libcrypt.so', 'libpthread.so']:
-+ name = 'libc.so'
-+ # search in standard locations (musl order)
-+ paths = ['/lib', '/usr/local/lib', '/usr/lib']
-+ if 'LD_LIBRARY_PATH' in os.environ:
-+ paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths
-+ for d in paths:
-+ f = os.path.join(d, name)
-+ if _is_elf(f):
-+ return os.path.basename(f)
-+
-+ prefix = os.path.join(d, 'lib'+name)
-+ for suffix in ['.so', '.so.*']:
-+ for f in glob('{0}{1}'.format(prefix, suffix)):
-+ if _is_elf(f):
-+ return os.path.basename(f)
-+
- else:
-
- def _findSoname_ldconfig(name):
diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python/patches/sysconfig.patch
deleted file mode 100644
index 6a089a89adb4a0..00000000000000
--- a/srcpkgs/python/patches/sysconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Lib/distutils/sysconfig.py 2019-10-19 20:38:44.000000000 +0200
-+++ b/Lib/distutils/sysconfig.py 2019-03-02 19:17:42.000000000 +0100
-@@ -181,8 +171,8 @@
- _osx_support.customize_compiler(_config_vars)
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
-
-- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-- get_config_vars('CC', 'CXX', 'CFLAGS',
-+ (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-+ get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
-
-@@ -206,7 +196,7 @@
- if 'LDFLAGS' in os.environ:
- ldshared = ldshared + ' ' + os.environ['LDFLAGS']
- if 'CFLAGS' in os.environ:
-- cflags = cflags + ' ' + os.environ['CFLAGS']
-+ cflags = opt + ' ' + os.environ['CFLAGS']
- ldshared = ldshared + ' ' + os.environ['CFLAGS']
- if 'CPPFLAGS' in os.environ:
- cpp = cpp + ' ' + os.environ['CPPFLAGS']
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
deleted file mode 100644
index 99d9642e998ab4..00000000000000
--- a/srcpkgs/python/template
+++ /dev/null
@@ -1,114 +0,0 @@
-# Template file for 'python'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
-pkgname=python
-version=2.7.18.7
-revision=5
-_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
-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=e41b3ebac8ac7b7e3364c7f28892f81153d23dd200ef6aaacec82080aa5d2b56
-
-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, libffi and zlib are not used.
- rm -r Modules/expat
- rm -r Modules/_ctypes/libffi*
- rm -r Modules/zlib
- # 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"
- 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}"
- 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/python/update
deleted file mode 100644
index cfb8828f7e490a..00000000000000
--- a/srcpkgs/python/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='v\K2\.7\.[\d.]*\d'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c8ea52100bc2d3..e14c508061fd98 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -286,6 +286,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ idle-python<=2.7.18.7_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
@@ -331,6 +332,8 @@ replaces="
libbitcoin-server<=3.6.0_10
libbitcoin-system-devel<=3.6.0_10
libbitcoin-system<=3.6.0_10
+ libclang-32bit<=15.0.7_3
+ libclang-cpp-32bit<=15.0.7_3
libco-devel<=20_1
libco<=20_1
libdbusmenu-qt<=0.9.2_4
@@ -403,6 +406,8 @@ replaces="
libzapojit<=0.0.3_10
litecoin<=0.18.1_11
livewallpaper<=0.5.0_2
+ lld-devel<=15.0.7_3
+ lldb-devel<=15.0.7_3
llvm10<=10.0.0_8
llvm11<=11.0.0_2
llvm3.9<=3.9.1_5
@@ -549,6 +554,7 @@ replaces="
python-dateutil<=2.8.2_2
python-dbus<=1.2.18_3
python-decorator<=4.4.2_2
+ python-devel<=2.7.18.7_4
python-distutils-extra<=2.39_8
python-docutils<=0.16_3
python-enchant<=2.0.0_4
@@ -586,6 +592,7 @@ replaces="
python-pathlib2<=2.3.4_6
python-pbr<=5.6.0_3
python-pgpdump<=1.5_10
+ python-pip<=20.3.4_1
python-pivy<=0.6.4_2
python-pluggy<=0.13.1_2
python-ply<=3.11_7
@@ -611,12 +618,14 @@ replaces="
python-scandir<=1.10.0_5
python-selectors2<=2.0.2_2
python-service_identity<=18.1.0_7
+ python-setuptools<=44.0.0_2
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-tkinter<=2.7.18.7_2
python-typing<=3.6.6_2
python-unicorn>=0
python-urllib3<=1.26.6_2
@@ -658,6 +667,7 @@ replaces="
python3-sqlalchemy-migrate<=0.12.0_6
python3-stormssh<=0.7.0_7
python3-txacme<=0.9.3_3
+ python<=2.7.18.7_4
qimageblitz<=0.0.6_4
qt-designer-devel<=4.8.7_29
qt-designer-libs<=4.8.7_29
@@ -760,10 +770,6 @@ replaces="
zou<=0.2.0_7
zuluplay-devel<=1.1_1
zuluplay<=1.1_1
- lldb-devel<=15.0.7_3
- lld-devel<=15.0.7_3
- libclang-32bit<=15.0.7_3
- libclang-cpp-32bit<=15.0.7_3
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 33b82a751887a6d99d254b7a1f37be67e64a9695 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:34:46 -0400
Subject: [PATCH 37/38] Manual.md: remove python 2 documentation
---
Manual.md | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/Manual.md b/Manual.md
index 34c737e6df427d..156ac3bb78a7fa 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
@@ -592,9 +592,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
@@ -1039,8 +1039,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.
@@ -1069,8 +1067,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
@@ -1589,7 +1585,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
@@ -1614,7 +1610,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
@@ -1635,10 +1631,6 @@ Also, a set of useful variables are defined to use in the templates:
| Variable | Value |
|-------------|----------------------------------|
-| py2_ver | 2.X |
-| py2_lib | usr/lib/python2.X |
-| py2_sitelib | usr/lib/python2.X/site-packages |
-| py2_inc | usr/include/python2.X |
| py3_ver | 3.X |
| py3_lib | usr/lib/python3.X |
| py3_sitelib | usr/lib/python3.X/site-packages |
From 5980b09fbe269010c8cc4f395bc58f03aafcc743 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 27 Oct 2023 10:35:04 -0400
Subject: [PATCH 38/38] common: remove python 2-specific code
---
common/build-style/python2-module.sh | 34 -------------------
common/build-style/waf.sh | 21 ------------
common/environment/setup/python.sh | 5 ---
.../04-create-xbps-metadata-scripts.sh | 2 --
4 files changed, 62 deletions(-)
delete mode 100644 common/build-style/python2-module.sh
delete mode 100644 common/build-style/waf.sh
diff --git a/common/build-style/python2-module.sh b/common/build-style/python2-module.sh
deleted file mode 100644
index 0a31b157dfc2f3..00000000000000
--- a/common/build-style/python2-module.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This helper is for templates installing python2-only modules.
-#
-
-do_build() {
- if [ -n "$CROSS_BUILD" ]; then
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- env CC="$CC" LDSHARED="$LDSHARED" \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python2 setup.py build ${make_build_args}
- else
- python2 setup.py build ${make_build_args}
- fi
-}
-
-do_install() {
- if [ -n "$CROSS_BUILD" ]; then
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/${py2_inc} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py2_lib} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- env CC="$CC" LDSHARED="$LDSHARED" \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python2 setup.py \
- install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- else
- python2 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- fi
-}
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}
-}
diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh
index ab5c47d52847b1..0aa40f908f8827 100644
--- a/common/environment/setup/python.sh
+++ b/common/environment/setup/python.sh
@@ -2,11 +2,6 @@
# Useful variables for determining Python version and paths.
#
-py2_ver="2.7"
-py2_lib="usr/lib/python${py2_ver}"
-py2_sitelib="${py2_lib}/site-packages"
-py2_inc="usr/include/python${py2_ver}"
-
py3_ver="3.12"
py3_abiver=""
py3_lib="usr/lib/python${py3_ver}"
diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
index 69e318a560819e..dee6832c6a8057 100644
--- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
+++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh
@@ -278,8 +278,6 @@ _EOF
if [ "$pycompile_version" = 3 ]; then
pycompile_version=${py3_ver}
- elif [ "$pycompile_version" = 2 ]; then
- pycompile_version=${py2_ver}
fi
if [ -n "${pycompile_dirs}" -o -n "${pycompile_module}" ]; then
prev parent reply other threads:[~2024-04-18 0:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 5:06 [PR PATCH] [NOMERGE] buildbot & deps: remove classabbyamp
2022-08-17 5:16 ` [PR PATCH] [Updated] " classabbyamp
2022-08-17 5:37 ` classabbyamp
2022-08-17 5:42 ` classabbyamp
2022-08-17 5:43 ` classabbyamp
2022-08-17 5:58 ` classabbyamp
2022-08-17 21:56 ` classabbyamp
2022-08-17 22:22 ` classabbyamp
2022-08-17 22:29 ` classabbyamp
2022-08-17 22:31 ` classabbyamp
2022-08-17 22:40 ` classabbyamp
2022-08-17 22:54 ` classabbyamp
2022-08-17 23:16 ` classabbyamp
2022-08-17 23:24 ` classabbyamp
2022-08-17 23:52 ` classabbyamp
2022-10-06 10:59 ` classabbyamp
2022-10-06 11:38 ` classabbyamp
2022-10-06 11:52 ` classabbyamp
2023-01-05 1:59 ` github-actions
2023-01-05 4:31 ` classabbyamp
2023-04-28 1:53 ` github-actions
2023-07-28 1:48 ` github-actions
2023-10-11 21:45 ` [PR PATCH] [Updated] " classabbyamp
2024-04-18 0:06 ` classabbyamp
2024-04-18 0:07 ` [NOMERGE] buildbot, deps, python 2: remove classabbyamp
2024-04-18 0:07 ` classabbyamp
2024-04-18 0:18 ` classabbyamp [this message]
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=20240418001852.8609621570@inbox.vuxu.org \
--to=classabbyamp@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).