diff --git a/dev-python/wrapt/wrapt-1.12.1.recipe b/dev-python/wrapt/wrapt-1.12.1.recipe
deleted file mode 100644
index f051ef507..000000000
--- a/dev-python/wrapt/wrapt-1.12.1.recipe
+++ /dev/null
@@ -1,65 +0,0 @@
-SUMMARY="Python module for decorators, wrappers and monkey patching"
-DESCRIPTION="The aim of the wrapt module is to provide a transparent object \
-proxy for Python, which can be used as the basis for the construction of \
-function wrappers and decorator functions."
-HOMEPAGE="https://github.com/GrahamDumpleton"
-COPYRIGHT="2013-2019, Graham Dumpleton"
-LICENSE="BSD (2-clause)"
-REVISION="3"
-SOURCE_URI="https://github.com/GrahamDumpleton/$portName/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="19f2043e05b76ce9b68971b387bfd8eed50c2ee1c9c0bd230edc422fec753917"
-SOURCE_DIR="$portVersionedName"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	$portName = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	gcc
-	"
-
-PYTHON_PACKAGES=(python38 python39)
-PYTHON_VERSIONS=(3.8 3.9)
-for i in "${!PYTHON_PACKAGES[@]}"; do
-	pythonPackage=${PYTHON_PACKAGES[i]}
-	pythonVersion=${PYTHON_VERSIONS[$i]}
-
-	eval "PROVIDES_$pythonPackage=\"
-		${portName}_$pythonPackage = $portVersion
-		\""
-	eval "REQUIRES_$pythonPackage=\"
-		haiku
-		cmd:python$pythonVersion\
-		\""
-	BUILD_REQUIRES="$BUILD_REQUIRES
-		setuptools_$pythonPackage"
-	BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-		cmd:python$pythonVersion"
-done
-
-INSTALL()
-{
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
-
-		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 \
-			"$prefix"/lib/python*
-	done
-}
diff --git a/dev-python/wrapt/wrapt-1.15.0.recipe b/dev-python/wrapt/wrapt-1.15.0.recipe
new file mode 100644
index 000000000..e0e826bb9
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.15.0.recipe
@@ -0,0 +1,86 @@
+SUMMARY="Python module for decorators, wrappers and monkey patching"
+DESCRIPTION="The aim of the wrapt module is to provide a transparent object \
+proxy for Python, which can be used as the basis for the construction of \
+function wrappers and decorator functions."
+HOMEPAGE="https://github.com/GrahamDumpleton"
+COPYRIGHT="2013-2023, Graham Dumpleton"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="https://pypi.io/packages/source/w/wrapt/wrapt-$portVersion.tar.gz"
+CHECKSUM_SHA256="d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	"
+
+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
+		\""
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			wrapt_$pythonPackage = $portVersion
+			\""
+	fi
+	eval "REQUIRES_$pythonPackage=\"
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES+="
+		build_$pythonPackage
+		installer_$pythonPackage
+		setuptools_$pythonPackage
+		wheel_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
+	TEST_REQUIRES+="
+		wrapt_$pythonPackage
+		pytest_$pythonPackage
+		"
+done
+
+
+INSTALL()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		python=python$pythonVersion
+
+		rm -rf dist
+
+		$python -m build --wheel --skip-dependency-check --no-isolation
+		$python -m installer --p $prefix dist/*.whl
+
+		packageEntries ${PYTHON_PACKAGES[i]} \
+			"$prefix"/lib/python*
+	done
+}
+
+
+TEST()
+{
+	for i in "${!PYTHON_VERSIONS[@]}"; do
+		python=python${PYTHON_VERSIONS[$i]}
+		$python -m pytest
+	done
+}