Merge pull request #3126 from lazka/breezy-3.2.2

breezy: Update to 3.2.2

breezy/PKGBUILD

@@ -1,9 +1,7 @@
 # Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
 
 pkgname=breezy
-_verbase=3.2.1
+pkgver=3.2.2
-_verminor=1
-pkgver=${_verbase}.${_verminor}
 pkgrel=1
 pkgdesc='A decentralized revision control system with support for Bazaar and Git file formats'
 arch=('i686' 'x86_64')
@@ -14,31 +12,39 @@ depends=('python-configobj'
          'python-fastimport'
          'python-dulwich'
          'python-patiencediff'
-         'python-six')
+         'python-fastbencode')
-makedepends=('python-setuptools' 'python-devel' 'gcc' 'cython')
+makedepends=(
+  'python-setuptools'
+  'python-build'
+  'python-installer'
+  'python-wheel'
+  'python-devel'
+  'gcc'
+  'cython'
+)
 provides=(bzr)
 conflicts=(bzr)
 replaces=(bzr)
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/breezy-team/breezy/archive/${_verbase}-${_verminor}.tar.gz
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/breezy-team/breezy/archive/brz-${pkgver}.tar.gz
         '0002-add-msys2-certs-location.patch')
-sha256sums=('6ef3dc8ade435e9641559e8e598148c49a6295f3767d3b64323d279bb25098c3'
+sha256sums=('5661f2e2348a60db4af9c4c8f417a3da3f0bbc02f7a41ce988baba5e1100f3f1'
             '8f3a1c151c9ceb8b2ace12dc1c80bd123810e2e77a2c784385d5ad039f0bd3bb')
 
 prepare(){
-  cd "${srcdir}/${pkgname}-${_verbase}-${_verminor}"
+  cd "${srcdir}/${pkgname}-brz-${pkgver}"
 
   patch -p1 -i ${srcdir}/0002-add-msys2-certs-location.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${_verbase}-${_verminor}"
+  cd "${srcdir}/${pkgname}-brz-${pkgver}"
 
-  python setup.py build --force --parallel "$(nproc)"
+  python -m build --wheel --no-isolation
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${_verbase}-${_verminor}"
+  cd "${srcdir}/${pkgname}-brz-${pkgver}"
 
-  python setup.py install --root="${pkgdir}" --install-data=usr/share --optimize=1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
   cp "${pkgdir}"/usr/bin/brz "${pkgdir}"/usr/bin/bzr
 }

python-fastbencode/PKGBUILD

@@ -0,0 +1,36 @@
+# Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
+
+pkgname=python-fastbencode
+pkgver=0.0.9
+pkgrel=1
+pkgdesc='Implementation of bencode with optional fast C extensions'
+arch=('i686' 'x86_64')
+url='https://github.com/breezy-team/fastbencode'
+license=(spdx:GPL-2.0-or-later)
+depends=(python)
+makedepends=(
+  python-build
+  python-installer
+  python-setuptools
+  python-wheel
+  python-devel
+  gcc
+)
+checkdepends=(python-pytest)
+source=(https://pypi.io/packages/source/f/fastbencode/fastbencode-$pkgver.tar.gz)
+sha256sums=('a508632c645f2e3ffbb4984cb544035c8946d6fec8cfe0aec5e556340773ce9c')
+
+build() {
+  cd fastbencode-$pkgver
+  python -m build --wheel --no-isolation
+}
+
+check() {
+  cd fastbencode-$pkgver
+  python -m pytest
+}
+
+package() {
+  cd fastbencode-$pkgver
+  python -m installer --destdir="$pkgdir" dist/*.whl
+}