Follow up to PR 9328. (#9341)

Just revision bumps to trigger builds at buildmasters,
and some minor recipe cleanups.

No functional changes intended or expected.

dev-python/iniconfig/iniconfig-1.1.1.recipe

@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/iniconfig/
 	http://github.com/RonnyPfannschmidt/iniconfig/"
 COPYRIGHT="2010-2020 Holger Krekel and Ronny Pfannschmidt"
 LICENSE="MIT"
-REVISION="6"
+REVISION="7"
 SOURCE_URI="https://github.com/RonnyPfannschmidt/iniconfig/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="a4489e91242e035cb58700d9a3c4bf49e0b106a85fefefe48025e333ea5ee49c"
 
@@ -33,29 +33,28 @@ BUILD_REQUIRES="
 PYTHON_PACKAGES=(python39 python310)
 PYTHON_VERSIONS=(3.9 3.10)
 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\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_scm_$pythonPackage
-	"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:git
-	cmd:python$pythonVersion
-	"
-done
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
 
-SETUPTOOLS_SCM_PRETEND_VERSION=$portVersion
-export SETUPTOOLS_SCM_PRETEND_VERSION
+	eval "PROVIDES_${pythonPackage}=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES+="
+		setuptools_scm_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
+done
 
 INSTALL()
 {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=$portVersion
+
 	for i in "${!PYTHON_PACKAGES[@]}"; do
 		pythonPackage=${PYTHON_PACKAGES[i]}
 		pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -63,12 +62,14 @@ INSTALL()
 		python=python$pythonVersion
 		installLocation=$prefix/lib/$python/vendor-packages/
 		export PYTHONPATH=$installLocation:$PYTHONPATH
+
 		mkdir -p $installLocation
 		rm -rf build
+
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
-		packageEntries  $pythonPackage \
+		packageEntries $pythonPackage \
 			$prefix/lib/python*
 	done
 }