pygame: fix recipe issues, update affected recipes. (#11530)

Fixes #11529.

games-simulation/singularity/singularity-1.00.recipe

@@ -5,7 +5,7 @@ have a chance."
 HOMEPAGE="https://singularity.github.io/"
 COPYRIGHT="2005-2023 EMH Software, Singularity community"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 srcGitTag="1.00"
 musicVersion="007"
 SOURCE_URI="https://github.com/singularity/singularity/archive/v$portVersion.tar.gz"
@@ -14,49 +14,46 @@ CHECKSUM_SHA256="5e747268d9e96e69adace1f346fe40d0c3ec05764b98e82cc3ab0335d96d917
 CHECKSUM_SHA256_2="eb5a3c2730731fda0cc7861977cd97937950b85d3fe08bc431054a639cc2c26d"
 ADDITIONAL_FILES="singularity.rdef.in"
 
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="any"
 
-pythonVer="python310"
+pythonVersion=3.10
+pythonPackage=python${pythonVersion//.}
+python=python$pythonVersion
 
 PROVIDES="
-	singularity$secondaryArchSuffix = $portVersion
+	singularity = $portVersion
 	app:singularity = $portVersion
 	"
+
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	# Previously, this package was built for archs "all !x86_gcc2" / "x86".
+	REPLACES="
+		singularity_x86
+		"
+fi
+
 REQUIRES="
-	haiku$secondaryArchSuffix
-	cmd:python3
-	importlib_metadata_$pythonVer
-	lib:libimagequant$secondaryArchSuffix
-	numpy_$pythonVer
-	pillow${secondaryArchSuffix}_$pythonVer
-	polib_$pythonVer
-	pygame$secondaryArchSuffix
+	haiku
+	numpy_$pythonPackage
+	pygame_$pythonPackage
+	cmd:python$pythonVersion
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libimagequant$secondaryArchSuffix
-	importlib_metadata_$pythonVer
-	numpy_$pythonVer
-	pillow${secondaryArchSuffix}_$pythonVer
-	polib_$pythonVer
-	pygame$secondaryArchSuffix
-	setuptools_$pythonVer
+	setuptools_$pythonPackage
 	"
 BUILD_PREREQUIRES="
-	cmd:python3
-	pip_$pythonVer
+	cmd:python$pythonVersion
 	"
 
 BUILD()
 {
-	python3 setup.py build
+	$python setup.py build
 }
 
 INSTALL()
 {
-	python3 setup.py install \
+	$python setup.py install \
 		--root=/ --prefix=$prefix \
 		--install-data=$dataDir
 	mkdir -p $appsDir
@@ -81,6 +78,5 @@ INSTALL()
 	addAppDeskbarSymlink $appsDir/Singularity "Endgame: Singularity"
 
 	# install music
-	local pythonDir="python3.10"
-	cp -r $sourceDir2/ $prefix/lib/$pythonDir/vendor-packages/singularity/music
+	cp -r $sourceDir2/ $prefix/lib/$python/vendor-packages/singularity/music
 }