From f42d76d0d4354faca99c89e2b70e181748f23a1f Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Wed, 7 Jun 2023 04:41:24 -0300
Subject: [PATCH] pillow: cleanups, fix provide of "non _x86" package name.
 (#8812)

---
 dev-python/pillow/pillow-9.2.0.recipe | 55 ++++++++++++++-------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/dev-python/pillow/pillow-9.2.0.recipe b/dev-python/pillow/pillow-9.2.0.recipe
index ce2c5a2fd..b9d8e881f 100644
--- a/dev-python/pillow/pillow-9.2.0.recipe
+++ b/dev-python/pillow/pillow-9.2.0.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="1997-2011 by Secret Labs AB
 	1995-2011 by Fredrik Lundh
 	2010-2022 by Alex Clark and contributors"
 LICENSE="HPND"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/python-pillow/Pillow/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="95836f00972dbf724bf1270178683a0ac4ea23c6c3a980858fc9f2f9456e32ef"
 SOURCE_FILENAME="pillow-$portVersion.tar.gz"
@@ -43,32 +43,35 @@ 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\n\
-	lib:liblcms2$secondaryArchSuffix\n\
-	lib:libfreetype$secondaryArchSuffix\n\
-	lib:libimagequant$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix\n\
-	lib:libopenjp2$secondaryArchSuffix\n\
-	lib:libtiff$secondaryArchSuffix\n\
-	lib:libwebp$secondaryArchSuffix\n\
-	lib:libz$secondaryArchSuffix\n\
-	\""
-if [ "$targetArchitecture" = "x86_gcc2" ]; then
-	eval "PROVIDES_${pythonPackage}+=\"\n\
-		projectx_$pythonPackage = $portVersion\
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
+
+	eval "PROVIDES_${pythonPackage}=\"
+		${portName}_$pythonPackage = $portVersion
 		\""
-fi
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		eval "PROVIDES_${pythonPackage}+=\"
+			pillow_$pythonPackage = $portVersion
+			\""
+	fi
+	eval "REQUIRES_$pythonPackage=\"
+		haiku${secondaryArchSuffix}
+		cmd:python$pythonVersion
+		lib:libfreetype$secondaryArchSuffix
+		lib:libimagequant$secondaryArchSuffix
+		lib:libjpeg$secondaryArchSuffix
+		lib:liblcms2$secondaryArchSuffix
+		lib:libopenjp2$secondaryArchSuffix
+		lib:libtiff$secondaryArchSuffix
+		lib:libwebp$secondaryArchSuffix
+		lib:libz$secondaryArchSuffix
+		\""
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
 done
 
 INSTALL()