From d53a6aa5e77d8a58ce07b2151b3f57e979d45025 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Wed, 29 Dec 2021 19:55:38 +0100
Subject: extra/python-setuptools: bootstrapping

---
 extra/python-setuptools/PKGBUILD                   |  28 +++++++++++----------
 .../setuptools-57.4.0-no-2to3.patch                | Bin 0 -> 2064 bytes
 2 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 extra/python-setuptools/setuptools-57.4.0-no-2to3.patch

(limited to 'extra/python-setuptools')

diff --git a/extra/python-setuptools/PKGBUILD b/extra/python-setuptools/PKGBUILD
index f72af23f..eba890bf 100644
--- a/extra/python-setuptools/PKGBUILD
+++ b/extra/python-setuptools/PKGBUILD
@@ -14,21 +14,23 @@ eval "$(
     '
 )"
 
-# repeat bootstrap hack from upstream, enable pip
-eval "$(
-  declare -f prepare | \
-    sed '
-      /rm/ i \
-        python -m ensurepip
-    '
-)"
+unset checkdepends
+unset check
+
+makedepends=(${makedepends[@]//python-setuptools/})
+makedepends=(${makedepends[@]//python2-setuptools/})
+depends=(${depends[@]//python-pyparsing/})
+depends=(${depends[@]//python2-pyparsing/})
+makedepends+=(python python2)
+
+# bootstrapping without python2 broken stuff
+source+=('setuptools-57.4.0-no-2to3.patch')
+sha512sums+=('cb9a654825dfea7f61b394d4d7e06202569efc7f8efac5527c3653c111b349ebe182b50332d41760e1585685923b7a17d8bb3e4ada48d33aebc4c2e379e2342c')
 
-# force bootstrapping
 eval "$(
   declare -f prepare | \
     sed '
-      $ i \
-        python bootstrap.py
-    '
+      /cd/ a \
+        patch -Np1 -i "${srcdir}"/setuptools-57.4.0-no-2to3.patch
+      '
 )"
-
diff --git a/extra/python-setuptools/setuptools-57.4.0-no-2to3.patch b/extra/python-setuptools/setuptools-57.4.0-no-2to3.patch
new file mode 100644
index 00000000..bcd24e18
Binary files /dev/null and b/extra/python-setuptools/setuptools-57.4.0-no-2to3.patch differ
-- 
cgit v1.2.3-54-g00ecf