From c88414feb1cb231003a68b9a908d2fcb94326eca Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Mon, 22 Jul 2024 13:30:59 -0300
Subject: [PATCH] packaging: update to version 24.1. (#10731)

- Don't use "build" to avoid circular dependencies for "build".
- License can be Apache v2 or BSD (2-clause", at user's discretion.

Helps with #10717.
---
 dev-python/packaging/packaging-23.0.recipe | 57 --------------------
 dev-python/packaging/packaging-24.1.recipe | 62 ++++++++++++++++++++++
 2 files changed, 62 insertions(+), 57 deletions(-)
 delete mode 100644 dev-python/packaging/packaging-23.0.recipe
 create mode 100644 dev-python/packaging/packaging-24.1.recipe

diff --git a/dev-python/packaging/packaging-23.0.recipe b/dev-python/packaging/packaging-23.0.recipe
deleted file mode 100644
index 61a75afa5..000000000
--- a/dev-python/packaging/packaging-23.0.recipe
+++ /dev/null
@@ -1,57 +0,0 @@
-SUMMARY="Core utilities for Python packages"
-DESCRIPTION="The 'packaging' project includes the following: \
-version handling, specifiers, markers, requirements, tags, utilities."
-HOMEPAGE="https://pypi.python.org/pypi/packaging"
-COPYRIGHT="2014-2021 Donald Stufft and individual contributors"
-LICENSE="Apache v2"
-REVISION="2"
-SOURCE_URI="https://pypi.io/packages/source/${portName:0:1}/$portName/$portName-$portVersion.tar.gz"
-CHECKSUM_SHA256="b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	$portName = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-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\n\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	build_$pythonPackage
-	flit_core_$pythonPackage
-	installer_$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
-		$python -m build -wn
-		$python -m installer --prefix=$prefix dist/*.whl
-
-		packageEntries  ${PYTHON_PACKAGES[i]} \
-			$prefix/lib/python*
-	done
-}
diff --git a/dev-python/packaging/packaging-24.1.recipe b/dev-python/packaging/packaging-24.1.recipe
new file mode 100644
index 000000000..1cd392707
--- /dev/null
+++ b/dev-python/packaging/packaging-24.1.recipe
@@ -0,0 +1,62 @@
+SUMMARY="Core utilities for Python packages"
+DESCRIPTION="The 'packaging' project includes the following: \
+version handling, specifiers, markers, requirements, tags, utilities."
+HOMEPAGE="https://pypi.python.org/pypi/packaging"
+COPYRIGHT="Donald Stufft and individual contributors"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="https://pypi.io/packages/source/${portName:0:1}/$portName/$portName-$portVersion.tar.gz"
+CHECKSUM_SHA256="026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+
+PYTHON_VERSIONS=(3.9 3.10)
+
+for i in "${!PYTHON_VERSIONS[@]}"; do
+	pythonVersion=${PYTHON_VERSIONS[$i]}
+	pythonPackage=python${pythonVersion//.}
+
+	eval "PROVIDES_$pythonPackage=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		cmd:python$pythonVersion
+		\""
+
+	BUILD_REQUIRES+="
+		flit_core_$pythonPackage
+		installer_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
+done
+
+
+INSTALL()
+{
+	for i in "${!PYTHON_VERSIONS[@]}"; do
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+		pythonPackage=python${pythonVersion//.}
+
+		python=python$pythonVersion
+
+		$python -m flit_core.wheel
+		$python -m installer --prefix=$prefix dist/*.whl
+
+		packageEntries $pythonPackage \
+			$prefix/lib/python*
+	done
+}