From cc0acf96d814cb46625f1eb903b6e06c9baeab3e Mon Sep 17 00:00:00 2001
From: OscarL <oscar.lesta@gmail.com>
Date: Wed, 20 Sep 2023 06:50:12 -0300
Subject: [PATCH] sip: update to version 6.7.11, support Python 3.10. (#9464)

Recipe cleanups/fixes.
---
 ...sip-6.7.9.patchset => sip-6.7.11.patchset} |  8 +-
 .../{sip-6.7.9.recipe => sip-6.7.11.recipe}   | 82 ++++++++++++-------
 2 files changed, 58 insertions(+), 32 deletions(-)
 rename dev-python/sip/patches/{sip-6.7.9.patchset => sip-6.7.11.patchset} (80%)
 rename dev-python/sip/{sip-6.7.9.recipe => sip-6.7.11.recipe} (51%)

diff --git a/dev-python/sip/patches/sip-6.7.9.patchset b/dev-python/sip/patches/sip-6.7.11.patchset
similarity index 80%
rename from dev-python/sip/patches/sip-6.7.9.patchset
rename to dev-python/sip/patches/sip-6.7.11.patchset
index 534cd929d..683451c39 100644
--- a/dev-python/sip/patches/sip-6.7.9.patchset
+++ b/dev-python/sip/patches/sip-6.7.11.patchset
@@ -1,11 +1,11 @@
-From 4fdd942a49577984bcc84acf1f7b7e7025d458ba Mon Sep 17 00:00:00 2001
+From a5b67fff1944aa8180f12f290892920b208a0906 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sun, 21 Nov 2021 00:01:45 +0100
 Subject: use get_python_inc
 
 
 diff --git a/sipbuild/project.py b/sipbuild/project.py
-index 6a12fba..84c8171 100644
+index 60a3e4f..92f910e 100644
 --- a/sipbuild/project.py
 +++ b/sipbuild/project.py
 @@ -22,6 +22,7 @@
@@ -16,7 +16,7 @@ index 6a12fba..84c8171 100644
  import os
  import packaging
  import shutil
-@@ -78,7 +79,7 @@ class Project(AbstractProject, Configurable):
+@@ -73,7 +74,7 @@ class Project(AbstractProject, Configurable):
          Option('py_debug', option_type=bool),
  
          # The name of the directory containing Python.h.
@@ -26,5 +26,5 @@ index 6a12fba..84c8171 100644
          # The name of the target Python platform.
          Option('py_platform'),
 -- 
-2.30.2
+2.37.3
 
diff --git a/dev-python/sip/sip-6.7.9.recipe b/dev-python/sip/sip-6.7.11.recipe
similarity index 51%
rename from dev-python/sip/sip-6.7.9.recipe
rename to dev-python/sip/sip-6.7.11.recipe
index fe29c9fa6..7fda6e59b 100644
--- a/dev-python/sip/sip-6.7.9.recipe
+++ b/dev-python/sip/sip-6.7.11.recipe
@@ -10,7 +10,7 @@ LICENSE="GNU GPL v2
 	SIP"
 REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/s/sip/sip-$portVersion.tar.gz"
-CHECKSUM_SHA256="35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17"
+CHECKSUM_SHA256="f0dc3287a0b172e5664931c87847750d47e4fdcda4fe362b514af8edd655b469"
 SOURCE_DIR="sip-$portVersion"
 PATCHES="sip-$portVersion.patchset"
 
@@ -26,13 +26,6 @@ fi
 
 PROVIDES="
 	sip$secondaryArchSuffix = $portVersion
-	cmd:sip = $portVersion
-	cmd:sip_build
-	cmd:sip_distinfo
-	cmd:sip_install
-	cmd:sip_module
-	cmd:sip_sdist
-	cmd:sip_wheel
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -46,31 +39,49 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PYTHON_PACKAGES=(python39)
-PYTHON_VERSIONS=(3.9)
+PYTHON_PACKAGES=(python39 python310)
+PYTHON_VERSIONS=(3.9 3.10)
+defaultVersion=3.10
 for i in "${!PYTHON_PACKAGES[@]}"; do
 	pythonPackage=${PYTHON_PACKAGES[i]}
 	pythonVersion=${PYTHON_VERSIONS[$i]}
 
-	maybe_sipNoSuffix=
-	if [ "$targetArchitecture" = "x86_gcc2" ]; then
-		maybe_sipNoSuffix="sip_$pythonPackage = $portVersion"
+	eval "PROVIDES_${pythonPackage}=\"
+		sip${secondaryArchSuffix}_$pythonPackage = $portVersion
+		cmd:sip_$pythonVersion = $portVersion
+		cmd:sip_build_$pythonVersion = $portVersion
+		cmd:sip_distinfo_$pythonVersion = $portVersion
+		cmd:sip_install_$pythonVersion = $portVersion
+		cmd:sip_module_$pythonVersion = $portVersion
+		cmd:sip_sdist_$pythonVersion = $portVersion
+		cmd:sip_wheel_$pythonVersion = $portVersion
+		\""
+	if [ $pythonVersion = $defaultVersion ]; then
+		eval "PROVIDES_${pythonPackage}+=\"
+			cmd:sip = $portVersion
+			cmd:sip_build = $portVersion
+			cmd:sip_distinfo = $portVersion
+			cmd:sip_install = $portVersion
+			cmd:sip_module = $portVersion
+			cmd:sip_sdist = $portVersion
+			cmd:sip_wheel = $portVersion
+			\""
 	fi
 
-	eval "
-		PROVIDES_${pythonPackage}=\"
-			sip${secondaryArchSuffix}_$pythonPackage = $portVersion
-			$maybe_sipNoSuffix
-			\"
-		REQUIRES_$pythonPackage=\"
-			haiku$secondaryArchSuffix
-			cmd:python$pythonVersion
-			packaging_$pythonPackage
-			ply_$pythonPackage
-			setuptools_$pythonPackage
-			toml_$pythonPackage
-			\"
-		"
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		eval "PROVIDES_${pythonPackage}+=\"
+			sip_$pythonPackage = $portVersion
+			\""
+	fi
+
+	eval "REQUIRES_$pythonPackage=\"
+		haiku$secondaryArchSuffix
+		packaging_$pythonPackage
+		ply_$pythonPackage
+		setuptools_$pythonPackage
+		tomli_$pythonPackage		# for Python < 3.11
+		cmd:python$pythonVersion
+		\""
 
 	BUILD_REQUIRES+="
 		build_$pythonPackage
@@ -91,10 +102,25 @@ INSTALL()
 
 		python=python$pythonVersion
 
+		rm -rf dist
+
 		$python -m build --wheel --no-isolation --skip-dependency-check
 		$python -m installer --prefix=$prefix dist/*.whl
 
+		# Version suffix all the scripts
+		for f in $commandBinDir/*; do
+			mv $f $f-$pythonVersion
+		done
+
+		# And provide suffix-less symlinks for the default version
+		if [ $pythonVersion = $defaultVersion ]; then
+			for f in $commandBinDir/*; do
+				ln -sr $f ${f%-$pythonVersion}
+			done
+		fi
+
 		packageEntries $pythonPackage \
-			"$prefix/lib/$python"
+			$prefix/lib/python* \
+			$commandBinDir
 	done
 }