Adopt and overhaul packaging

* Prepare Python build for reproducible build verification
* Prefer to use tooling (setuptools-scm) specified by upstream rather
  than patches that need maintaining on every release bump.
* Cleanup coding style (largely to my preferences, but also making sure
  bash quoting is valid and matches shellharden output)
* Place fields in Wiki recommended order, sort dependencies

3 files changed, 27 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf2e9e48a8bc..f7afd1dc072e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = python-cffsubr
 	pkgdesc = Standalone CFF subroutinizer based on AFDKO tx
 	pkgver = 0.2.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/adobe-type-tools/cffsubr
 	arch = x86_64
 	license = Apache
 	checkdepends = python-pytest
-	makedepends = python-setuptools
+	makedepends = python-setuptools-git-ls-files
+	makedepends = python-setuptools-scm
 	depends = python-fonttools
 	source = https://files.pythonhosted.org/packages/source/c/cffsubr/cffsubr-0.2.8.tar.gz
-	source = install.patch
 	sha256sums = e24bd03c94944e1536ec8437ab83fb4ac38477412426c1ffd4e056dd16cde235
-	sha256sums = fcbb43d2f977e6aca13c4d2ec4e8012417996339b4d7f6b2bf0cedb90ebed9c5
 
 pkgname = python-cffsubr
diff --git a/PKGBUILD b/PKGBUILD
index f2d51a1b7753..b359c0543b6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,34 @@
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Maintainer: Guillaume Horel <guillaume.horel@gmail.com>
 
-pkgname='python-cffsubr'
-_pkgname='cffsubr'
+pkgname=python-cffsubr
+_pyname=${pkgname#python-}
 pkgver=0.2.8
-pkgrel=1
-pkgdesc="Standalone CFF subroutinizer based on AFDKO tx"
-url="https://github.com/adobe-type-tools/cffsubr"
-checkdepends=('python-pytest')
-depends=('python-fonttools')
-makedepends=('python-setuptools')
-optdepends=()
-license=('Apache')
-arch=('x86_64')
-source=("https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-    "install.patch")
-sha256sums=('e24bd03c94944e1536ec8437ab83fb4ac38477412426c1ffd4e056dd16cde235'
-            'fcbb43d2f977e6aca13c4d2ec4e8012417996339b4d7f6b2bf0cedb90ebed9c5')
-
-prepare() {
-    cd "${_pkgname}-${pkgver}"
-    patch -p1 < ../install.patch
-}
+pkgrel=2
+pkgdesc='Standalone CFF subroutinizer based on AFDKO tx'
+arch=(x86_64)
+url="https://github.com/adobe-type-tools/$_pyname"
+license=(Apache)
+depends=(python-fonttools)
+makedepends=(python-setuptools-{git-ls-files,scm})
+checkdepends=(python-pytest)
+_archive="$_pyname-$pkgver"
+source=("https://files.pythonhosted.org/packages/source/${_pyname::1}/$_pyname/$_archive.tar.gz")
+sha256sums=('e24bd03c94944e1536ec8437ab83fb4ac38477412426c1ffd4e056dd16cde235')
 
 build() {
-    cd "${_pkgname}-${pkgver}"
-    python setup.py build
+	cd "$_archive"
+	export PYTHONHASHSEED=0
+	python setup.py build_ext --inplace
+	python setup.py build
 }
 
-package() {
-    cd "${_pkgname}-${pkgver}"
-    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+check() {
+	cd "$_archive"
+	PYTHONPATH=src pytest tests
 }
 
-check() {
-    cd "$_pkgname-$pkgver"
-    python setup.py build_ext --inplace
-    PYTHONPATH=src pytest tests/
+package() {
+	cd "$_archive"
+	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }
diff --git a/install.patch b/install.patch
deleted file mode 100644
index 33e6f6d37603..000000000000
--- a/install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN cffsubr-0.2.8-orig/setup.py cffsubr-0.2.8/setup.py
---- cffsubr-0.2.8-orig/setup.py	2021-07-19 12:16:53.924141568 -0400
-+++ cffsubr-0.2.8/setup.py	2021-07-19 12:17:12.630869015 -0400
-@@ -142,11 +142,6 @@
-         "importlib_resources; python_version < '3.7'",
-         "fontTools >= 4.10.2",
-     ],
--    setup_requires=[
--        "setuptools_scm",
--        # finds all git tracked files including submodules when making sdist MANIFEST
--        "setuptools-git-ls-files",
--    ],
-     extras_require={"testing": ["pytest"]},
-     python_requires=">=3.6",
-     classifiers=[