From f2dc3049c74d299e687f39b8bca7f7926d6503ad Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Tue, 21 Mar 2023 04:14:01 -0300
Subject: [PATCH] twisted: recipe clean up (#8028)

- use loops for PROVIDES_pythonxx.
- simplify code where possible.
- remove checks related to x86_gcc2.

It should be easier to add support for newer Python versions now.
---
 dev-python/twisted/twisted-22.8.0.recipe | 74 +++++++-----------------
 1 file changed, 21 insertions(+), 53 deletions(-)

diff --git a/dev-python/twisted/twisted-22.8.0.recipe b/dev-python/twisted/twisted-22.8.0.recipe
index b9bb152d2..37e68452b 100644
--- a/dev-python/twisted/twisted-22.8.0.recipe
+++ b/dev-python/twisted/twisted-22.8.0.recipe
@@ -63,11 +63,6 @@ REQUIRES_$pythonPackage=\"\
 	incremental_$pythonPackage\n\
 	zope_interface_$pythonPackage\n\
 	\""
-if [ "$targetArchitecture" = "x86_gcc2" ]; then
-	eval "PROVIDES_${pythonPackage}+=\"\n\
-		twisted_$pythonPackage = $portVersion\
-		\""
-fi
 BUILD_REQUIRES="$BUILD_REQUIRES
 	incremental_$pythonPackage
 	setuptools_$pythonPackage"
@@ -75,34 +70,23 @@ BUILD_PREREQUIRES="$BUILD_PREREQUIRES
 	cmd:python$pythonVersion"
 done
 
-PROVIDES_python39="$PROVIDES_python39
-	cmd:cftp39
-	cmd:ckeygen39
-	cmd:conch39
-	cmd:mailmail39
-	cmd:manhole39
-	cmd:pyhtmlizer39
-	cmd:tap2deb39
-	cmd:tap2rpm39
-	cmd:tkconch39
-	cmd:trial39
-	cmd:twist39
-	cmd:twistd39
-	"
-PROVIDES_python310="$PROVIDES_python310
-	cmd:cftp310
-	cmd:ckeygen310
-	cmd:conch310
-	cmd:mailmail310
-	cmd:manhole310
-	cmd:pyhtmlizer310
-	cmd:tap2deb310
-	cmd:tap2rpm310
-	cmd:tkconch310
-	cmd:trial310
-	cmd:twist310
-	cmd:twistd310
-	"
+for i in "${!PYTHON_VERSIONS[@]}"; do
+pyVer=${PYTHON_VERSIONS[i]//.} # remove dot from version
+eval "PROVIDES_python${pyVer}+=\"\n\
+	cmd:cftp$pyVer\n\
+	cmd:ckeygen$pyVer\n\
+	cmd:conch$pyVer\n\
+	cmd:mailmail$pyVer\n\
+	cmd:manhole$pyVer\n\
+	cmd:pyhtmlizer$pyVer\n\
+	cmd:tap2deb$pyVer\n\
+	cmd:tap2rpm$pyVer\n\
+	cmd:tkconch$pyVer\n\
+	cmd:trial$pyVer\n\
+	cmd:twist$pyVer\n\
+	cmd:twistd$pyVer\n\
+	\""
+done
 
 INSTALL()
 {
@@ -118,26 +102,10 @@ INSTALL()
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
-		if [ $pythonPackage = python3 ]; then
-			for f in $prefix/bin/*; do
-				mv $f ${f}3
-			done
-		fi
-		if [ $pythonPackage = python38 ]; then
-			for f in $prefix/bin/*; do
-				mv $f ${f}38
-			done
-		fi
-		if [ $pythonPackage = python39 ]; then
-			for f in $prefix/bin/*; do
-				mv $f ${f}39
-			done
-		fi
-		if [ $pythonPackage = python310 ]; then
-			for f in $prefix/bin/*; do
-				mv $f ${f}310
-			done
-		fi
+		pyVer=${pythonVersion//.}
+		for f in $prefix/bin/*; do
+			mv $f ${f}$pyVer
+		done
 
 		install -m 755 -d "$docDir"
 		install -m 644 -t "$docDir" README.rst