update to 2.3.1

2 files changed, 33 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 776279e3ce6a..63e54b0a1081 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = python-imapclient
-	pkgdesc = An easy-to-use, Pythonic and complete IMAP client library with no dependencies outside the Python standard library
-	pkgver = 2.2.0
+	pkgdesc = Easy-to-use, Pythonic and complete IMAP client library
+	pkgver = 2.3.1
 	pkgrel = 1
-	url = https://github.com/mjs/imapclient/
+	url = https://github.com/mjs/imapclient
 	arch = any
 	license = BSD
-	makedepends = python-distribute
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python
-	depends = python-backports.ssl
-	options = !emptydirs
-	source = https://github.com/mjs/imapclient/archive/2.2.0.tar.gz
-	md5sums = c90f93ce0b3a7dfe26409141b66295fc
+	source = python-imapclient-2.3.1.tar.gz::https://github.com/mjs/imapclient/archive/d0f5c4e.tar.gz
+	sha256sums = 130dc944f5f063a32e4f2980e3110947b574266e7fae20873726bdc5079b5e38
 
 pkgname = python-imapclient
-
diff --git a/PKGBUILD b/PKGBUILD
index d9d6ad4a3e24..dffbebb48d20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,31 @@
-# Maintainer: Dario Pellegrini <pellegrini.dario at gmail dot com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Dario Pellegrini <pellegrini.dario at gmail dd0f5c4e.diffot com>
+
 pkgname=python-imapclient
-pkgver=2.2.0
+_pkgname=IMAPClient
+_pkg="${pkgname#python-}"
+pkgver=2.3.1
+_commit=d0f5c4e927ddda1972066ef04242a09d2dc2a666
+_com="${_commit::7}"
 pkgrel=1
-pkgdesc="An easy-to-use, Pythonic and complete IMAP client library with no dependencies outside the Python standard library"
+pkgdesc="Easy-to-use, Pythonic and complete IMAP client library"
 arch=('any')
-url="https://github.com/mjs/imapclient/"
+url="https://github.com/mjs/imapclient"
 license=('BSD')
-depends=('python' 'python-backports.ssl')
-makedepends=('python-distribute')
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=(!emptydirs)
-source=("https://github.com/mjs/imapclient/archive/$pkgver.tar.gz")
-md5sums=('c90f93ce0b3a7dfe26409141b66295fc')
+depends=('python')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$_com.tar.gz")
+sha256sums=('130dc944f5f063a32e4f2980e3110947b574266e7fae20873726bdc5079b5e38')
 
-package() {
-  cd "$srcdir/imapclient-$pkgver"
-  python setup.py install --root=$pkgdir/ --optimize=1
+build() {
+	cd "$_pkg-$_commit"
+	python -m build --wheel --no-isolation
 }
 
+package() {
+	cd "$_pkg-$_commit"
+	python -m installer --destdir "$pkgdir" dist/*.whl
+	local _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
+	install -dv "$pkgdir/usr/share/licenses/$pkgname/"
+	ln -sv "$_site/$_pkgname-$pkgver.dist-info/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}