diff --git a/dev-python/qrcode/qrcode-7.2.recipe b/dev-python/qrcode/qrcode-7.2.recipe
index ae69cebca..e64b4f360 100644
--- a/dev-python/qrcode/qrcode-7.2.recipe
+++ b/dev-python/qrcode/qrcode-7.2.recipe
@@ -4,60 +4,58 @@ the generation of QR Codes."
 HOMEPAGE="https://github.com/lincolnloop/python-qrcode/"
 COPYRIGHT="2011 Lincoln Loop"
 LICENSE="BSD (3-clause)"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/lincolnloop/python-qrcode/archive/refs/tags/v$portVersion.tar.gz"
 CHECKSUM_SHA256="051935ae06d8180a5a2413192dd236fdc6a2f3da3ef04af682afbe9d5c3286f4"
 SOURCE_FILENAME="qrcode-v$portVersion.tar.gz"
 SOURCE_DIR="python-qrcode-$portVersion"
 
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="any"
 
 PROVIDES="
 	$portName = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
+	haiku_devel
 	"
 
 PYTHON_PACKAGES=(python38 python39 python310)
 PYTHON_VERSIONS=(3.8 3.9 3.10)
+defaultVersion=3.9
 for i in "${!PYTHON_PACKAGES[@]}"; do
-pythonPackage=${PYTHON_PACKAGES[i]}
-pythonVersion=${PYTHON_VERSIONS[$i]}
-eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\
-	\""
-if [ "$targetArchitecture" = "x86_gcc2" ]; then
-	eval "PROVIDES_${pythonPackage}+=\"\n\
-		qrcode_$pythonPackage = $portVersion\
-		\""
-fi
-BUILD_REQUIRES="$BUILD_REQUIRES
-	lxml_$pythonPackage
-	pillow${secondaryArchSuffix}_$pythonPackage
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
-done
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
 
-for i in "${!PYTHON_VERSIONS[@]}"; do
-pyversion=${PYTHON_VERSIONS[i]}
-pyVer=${PYTHON_VERSIONS[i]//.} # remove dot from version
-eval "PROVIDES_python${pyVer}+=\"\n\
-	cmd:qr$pyversion\n\
-	\""
+	eval "PROVIDES_$pythonPackage=\"
+		${portName}_$pythonPackage = $portVersion
+		cmd:qr_$pythonVersion = $portVersion
+		\""
+	# Provide non-suffixed cmd only for the default Python version
+	if [ $pythonVersion = $defaultVersion ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			cmd:qr = $portVersion
+			\""
+	fi
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			qrcode_$pythonPackage = $portVersion
+			\""
+	fi
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		pillow_$pythonPackage
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
 done
 
 
@@ -75,7 +73,11 @@ INSTALL()
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
-		mv $prefix/bin/qr $prefix/bin/qr$pythonVersion
+		mv $binDir/qr $binDir/qr-$pythonVersion
+		# Provide suffix-less symlinks for the default version:
+		if [ $pythonVersion = $defaultVersion ]; then
+			ln -sr $binDir/qr-$pythonVersion $binDir/qr
+		fi
 
 		mkdir -p $(dirname $manDir)
 		mv $prefix/share/man $manDir