From ed8ca21bb96e45138914ac1999525de31f01e545 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Sat, 19 Jun 2021 22:15:53 +0200
Subject: [PATCH] dev-util/psautohint: enable py3.9

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-util/psautohint/metadata.xml            | 7 ++++++-
 dev-util/psautohint/psautohint-2.3.0.ebuild | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-util/psautohint/metadata.xml b/dev-util/psautohint/metadata.xml
index 6f49eba8f4..a992e2a31e 100644
--- a/dev-util/psautohint/metadata.xml
+++ b/dev-util/psautohint/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+    <!-- maintainer-needed -->
+    <upstream>
+        <bugs-to>https://github.com/adobe-type-tools/psautohint/issues</bugs-to>
+        <remote-id type="github">adobe-type-tools/psautohint</remote-id>
+        <remote-id type="pypi">psautohint</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/dev-util/psautohint/psautohint-2.3.0.ebuild b/dev-util/psautohint/psautohint-2.3.0.ebuild
index 0d30488bf8..90713fbb32 100644
--- a/dev-util/psautohint/psautohint-2.3.0.ebuild
+++ b/dev-util/psautohint/psautohint-2.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 COMMIT="1e4c5061d328105c4dcfcb6fdbc27ec49b3e9d23"
 DISTUTILS_IN_SOURCE_BUILD=1
 EMESON_SOURCE="${S}/libpsautohint"
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit meson distutils-r1
 
@@ -37,7 +37,6 @@ pkg_setup() {
 	local _v=$(ver_cut 4)
 	_v="$(ver_cut 1-3)${_v:0:1}$(ver_cut 5)"
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${_v/p/.post}"
-	MESON_BUILD_DIR="${WORKDIR}/${P}-build"
 }
 
 src_unpack() {
@@ -48,6 +47,7 @@ src_unpack() {
 }
 
 src_configure() {
+	MESON_BUILD_DIR="${WORKDIR}/${P}-build"
 	BUILD_DIR="${MESON_BUILD_DIR}" meson_src_configure
 	distutils-r1_src_configure
 }