From d5a5e9f8d6449474ac96857089612bdc9ecf82a0 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 8 Sep 2022 12:27:43 +0200
Subject: [PATCH] bcrypt, add python3.10, cleanup (#7177)

---
 dev-python/bcrypt/bcrypt-3.2.0.recipe | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/dev-python/bcrypt/bcrypt-3.2.0.recipe b/dev-python/bcrypt/bcrypt-3.2.0.recipe
index 2c6234e34..5d4166285 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.recipe
+++ b/dev-python/bcrypt/bcrypt-3.2.0.recipe
@@ -4,11 +4,11 @@ servers."
 HOMEPAGE="https://pypi.python.org/pypi/bcrypt"
 COPYRIGHT="2013 Donald Stufft"
 LICENSE="Apache v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://pypi.io/packages/source/b/bcrypt/bcrypt-$portVersion.tar.gz"
 CHECKSUM_SHA256="5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -25,18 +25,8 @@ BUILD_PREREQUIRES="
 	gcc$secondaryArchSuffix
 	"
 
-PYTHON_PACKAGES=()
-PYTHON_VERSIONS=()
-# We don't have python2 for secondaryArch
-if [ -z "$secondaryArchSuffix" ]; then
-	PYTHON_PACKAGES+=(python)
-	PYTHON_VERSIONS+=(2.7)
-fi
-# gcc2 does not support the flags passed by python3
-if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-	PYTHON_PACKAGES+=(python3)
-	PYTHON_VERSIONS+=(3.7)
-fi
+PYTHON_PACKAGES=(python3 python38 python39 python310)
+PYTHON_VERSIONS=(3.7 3.8 3.9 3.10)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -45,20 +35,15 @@ eval "PROVIDES_${pythonPackage}=\"\
 	\"; \
 REQUIRES_$pythonPackage=\"\
 	haiku\n\
-	cffi_$pythonPackage\n\
+	cffi${secondaryArchSuffix}_$pythonPackage\n\
 	cmd:python$pythonVersion\
 	\""
 BUILD_REQUIRES="$BUILD_REQUIRES
-	cffi_$pythonPackage
+	cffi${secondaryArchSuffix}_$pythonPackage
 	setuptools_$pythonPackage"
 BUILD_PREREQUIRES="$BUILD_PREREQUIRES
 	cmd:python$pythonVersion"
 done
-if [ "$targetArchitecture" = x86_gcc2 -a -n "$secondaryArchSuffix" ]; then
-	PROVIDES_python3+="
-		bcrypt_python3 = $portVersion
-		"
-fi
 
 INSTALL()
 {