From 19c6099c95d9d2cccfe6de7a11203fbc8e8a0935 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 27 Jul 2022 09:43:53 +0200
Subject: [PATCH] Use the new flit_core.wheel command for bootstrapping

---
 python-installer/PKGBUILD |  5 ++---
 python-pep517/PKGBUILD    | 12 +++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/python-installer/PKGBUILD b/python-installer/PKGBUILD
index 93040a52..995626ab 100644
--- a/python-installer/PKGBUILD
+++ b/python-installer/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=installer
 pkgname="python-${_realname}"
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A low-level library for installing from a Python wheel distribution"
 arch=('any')
 url='https://github.com/pypa/installer'
@@ -18,8 +18,7 @@ sha256sums=('f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445')
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  mkdir -p dist
-  python -c "from flit_core import buildapi; buildapi.build_wheel('dist/')"
+  python -m flit_core.wheel
 }
 
 package() {
diff --git a/python-pep517/PKGBUILD b/python-pep517/PKGBUILD
index bc70ebc3..fde37156 100644
--- a/python-pep517/PKGBUILD
+++ b/python-pep517/PKGBUILD
@@ -4,26 +4,28 @@ _realname=pep517
 
 pkgname="python-${_realname}"
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Wrappers to build Python packages using PEP 517 hooks"
 arch=('any')
 url="https://github.com/pypa/pep517"
 license=('spdx:MIT')
 depends=("python-tomli")
-makedepends=("python-setuptools")
+makedepends=(
+  "python-flit-core"
+  "python-installer"
+)
 source=("https://pypi.io/packages/source/p/pep517/pep517-${pkgver}.tar.gz")
 sha256sums=('931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0')
 
 build() {
   cd "${_realname}-${pkgver}"
 
-  python setup.py build
+  python -m flit_core.wheel
 }
 
 package() {
   cd "${_realname}-${pkgver}"
 
-  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-
+  python -m installer --destdir="${pkgdir}" dist/*.whl
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/python-${_realname}/LICENSE"
 }