From b971102378d6384055ac7f683f2e55aaac7f3ff4 Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Wed, 7 Jun 2023 04:00:51 -0300
Subject: [PATCH] regex: cleanup, provide "non _x86" package name, enable on 32
 bits. (#8816)

---
 dev-python/regex/regex-2020.1.8.recipe | 38 ++++++++++++++++----------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/dev-python/regex/regex-2020.1.8.recipe b/dev-python/regex/regex-2020.1.8.recipe
index 243c897eb..4eccc22bb 100644
--- a/dev-python/regex/regex-2020.1.8.recipe
+++ b/dev-python/regex/regex-2020.1.8.recipe
@@ -4,12 +4,12 @@ standard ‘re’ module, but offers additional functionality."
 HOMEPAGE="https://pypi.org/project/regex/"
 COPYRIGHT="2013-2020 Matthew Barnett"
 LICENSE="MIT"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://pypi.org/packages/source/r/regex/regex-$portVersion.tar.gz"
 CHECKSUM_SHA256="d0f424328f9822b0323b3b6f2e4b9c90960b24743d220763c7f07071e0778351"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	$portName = $portVersion
@@ -29,19 +29,27 @@ BUILD_PREREQUIRES="
 PYTHON_PACKAGES=(python38 python39 python310)
 PYTHON_VERSIONS=(3.8 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$secondaryArchSuffix\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
+
+	eval "PROVIDES_${pythonPackage}=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			regex_$pythonPackage = $portVersion
+			\""
+	fi
+	eval "REQUIRES_$pythonPackage=\"
+		haiku$secondaryArchSuffix
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
 done
 
 INSTALL()