diff --git a/dev-python/pycryptodome/pycryptodome-3.17.recipe b/dev-python/pycryptodome/pycryptodome-3.17.recipe
index 182f657e1..7d4e3775e 100644
--- a/dev-python/pycryptodome/pycryptodome-3.17.recipe
+++ b/dev-python/pycryptodome/pycryptodome-3.17.recipe
@@ -14,7 +14,7 @@ LICENSE="BSD (2-clause)
 	Public Domain
 	Unlicense
 	"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://pypi.python.org/packages/source/p/pycryptodome/pycryptodome-$portVersion.tar.gz"
 CHECKSUM_SHA256="bce2e2d8e82fcf972005652371a3e8731956a0c1fbb719cc897943b3695ad91b"
 SOURCE_FILENAME="pycryptodome-$portVersion.tar.gz"
@@ -38,24 +38,32 @@ 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$secondaryArchSuffix\n\
-	lib:libgmp$secondaryArchSuffix\n\
-	cmd:python$pythonVersion\
-	\""
-eval "CONFLICTS_$pythonPackage='
-	pycrypto_$pythonPackage
-	'"
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="
-	cmd:cc$secondaryArchSuffix
-	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+=\"
+			pycryptodome_$pythonPackage = $portVersion
+			\""
+	fi
+	eval "REQUIRES_$pythonPackage=\"
+		haiku$secondaryArchSuffix
+		lib:libgmp$secondaryArchSuffix
+		cmd:python$pythonVersion
+		\""
+	eval "CONFLICTS_$pythonPackage='
+		pycrypto_$pythonPackage
+		'"
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:cc$secondaryArchSuffix
+		cmd:python$pythonVersion
+		"
 done
 
 TEST_REQUIRES="
diff --git a/dev-python/pycryptodome/pycryptodomex-3.17.recipe b/dev-python/pycryptodome/pycryptodomex-3.17.recipe
index e31185f2a..4f57a9b19 100644
--- a/dev-python/pycryptodome/pycryptodomex-3.17.recipe
+++ b/dev-python/pycryptodome/pycryptodomex-3.17.recipe
@@ -13,7 +13,7 @@ LICENSE="BSD (2-clause)
 	Public Domain
 	Unlicense
 	"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://pypi.python.org/packages/source/p/pycryptodome/pycryptodome-$portVersion.tar.gz"
 CHECKSUM_SHA256="bce2e2d8e82fcf972005652371a3e8731956a0c1fbb719cc897943b3695ad91b"
 SOURCE_FILENAME="pycryptodome-$portVersion.tar.gz"
@@ -37,21 +37,27 @@ 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$secondaryArchSuffix\n\
-	lib:libgmp$secondaryArchSuffix\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="
-	cmd:cc$secondaryArchSuffix
-	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+=\"
+			pycryptodomex_$pythonPackage = $portVersion
+			\""
+	fi
+	eval "REQUIRES_$pythonPackage=\"
+		haiku$secondaryArchSuffix
+		lib:libgmp$secondaryArchSuffix
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES="$BUILD_REQUIRES
+		setuptools_$pythonPackage"
+	BUILD_PREREQUIRES="
+		cmd:cc$secondaryArchSuffix
+		cmd:python$pythonVersion"
 done
 
 TEST_REQUIRES="