From 8cc8433162c2dc4b45cbbc79206e2dd5085eeb51 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 25 Jan 2021 21:37:03 +0100
Subject: [PATCH] picard: switch to python 3.8

---
 media-sound/picard/picard-2.5.6.recipe | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/media-sound/picard/picard-2.5.6.recipe b/media-sound/picard/picard-2.5.6.recipe
index 96d8a39c5..426a78b00 100644
--- a/media-sound/picard/picard-2.5.6.recipe
+++ b/media-sound/picard/picard-2.5.6.recipe
@@ -12,7 +12,7 @@ HOMEPAGE="https://picard.musicbrainz.org/"
 COPYRIGHT="2004-2021 Robert Kaye, Lukas Lalinsky, Laurent Monin, \
 Sambhav Kothari, Philipp Wolfer and others"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="ftp://ftp.eu.metabrainz.org/pub/musicbrainz/picard/picard-$portVersion.tar.gz"
 CHECKSUM_SHA256="1d56332d9577d79a551e857e246b5c97c2ec4a8abbdeb945c6763e31c3bf9527"
 SOURCE_DIR="picard-release-$portVersion"
@@ -33,24 +33,24 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	cmd:fpcalc
-	cmd:python3.7
-	dateutil_python3
-	discid_python3
+	cmd:python3.8
+	dateutil_python38
+	discid_python38
 	lib:libdiscid$secondaryArchSuffix
-	markdown_python3
-	mutagen_python3
-	pyqt_python3
+	markdown_python38
+	mutagen_python38
+	pyqt5_python38
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	pyqt_python3
-	setuptools_python3
+	pyqt5_python38
+	setuptools_python38
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:msgfmt$secondaryArchSuffix
-	cmd:python3.7
+	cmd:python3.8
 	"
 
 PATCH()
@@ -65,16 +65,16 @@ BUILD()
 	#Rebuild resources
 	rm -f resources/picard.qrc
 	rm -f picard/resources.py
-	python3 resources/makeqrc.py
-	python3 resources/compile.py
+	python3.8 resources/makeqrc.py
+	python3.8 resources/compile.py
 
-	python3 setup.py config
+	python3.8 setup.py config
 }
 
 INSTALL()
 {
 	LC_ALL=en_US.UTF-8
-	python3 setup.py install \
+	python3.8 setup.py install \
 		--root=/ --prefix=$prefix \
 		--install-data=$dataDir \
 		--install-locales=$dataDir/locale \
@@ -87,7 +87,7 @@ INSTALL()
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`"
-	if [ -z "$MINOR"]; then MINOR=0; fi
+	if [ -z "$MINOR" ]; then MINOR=0; fi
 
 	sed \
 		-e "s|@MAJOR@|$MAJOR|" \