From d3ea0ffb16ff480b7d92ebdcc19b3f692de5dd4e Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Tue, 15 Jul 2025 17:09:54 -0300
Subject: [PATCH] httplib2: cleanups, drop Python 3.9 support.

---
 dev-python/httplib2/httplib2-0.20.4.recipe | 47 ++++++++++++----------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/dev-python/httplib2/httplib2-0.20.4.recipe b/dev-python/httplib2/httplib2-0.20.4.recipe
index 3153dca71..98888d7ff 100644
--- a/dev-python/httplib2/httplib2-0.20.4.recipe
+++ b/dev-python/httplib2/httplib2-0.20.4.recipe
@@ -4,8 +4,8 @@ libraries."
 HOMEPAGE="https://github.com/httplib2/httplib2/"
 COPYRIGHT="2006-2022 Joe Gregorio"
 LICENSE="MIT"
-REVISION="3"
-SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
+REVISION="4"
+SOURCE_URI="https://github.com/httplib2/httplib2/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="a6d079ae974ae408ac57d61aa2eee1d3be2cb250ae31d60507f1ecd2c6ca3002"
 SOURCE_FILENAME="httplib2-v$portVersion.tar.gz"
 
@@ -22,39 +22,42 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 
-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\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+for pythonVersion in ${PYTHON_VERSIONS[@]}; do
+	pythonPackage=python${pythonVersion//.}
+
+	eval "PROVIDES_$pythonPackage=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		cmd:python$pythonVersion
+		\""
+
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
 done
 
 INSTALL()
 {
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
+	for pythonVersion in ${PYTHON_VERSIONS[@]}; do
+		pythonPackage=python${pythonVersion//.}
 
 		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 \
+		packageEntries $pythonPackage \
 			$prefix/lib/python*
 	done
 }