sip: bump version

haikuports · May 13, 2023 · d24d201 · d24d201
1 parent 680d1f8
commit d24d201
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/dev-python/sip/patches/sip-6.4.0.patchset → dev-python/sip/patches/sip-6.7.9.patchset b/dev-python/sip/patches/sip-6.4.0.patchset → dev-python/sip/patches/sip-6.7.9.patchset
diff --git a/dev-python/sip/sip-6.4.0.recipe → dev-python/sip/sip-6.7.9.recipe b/dev-python/sip/sip-6.4.0.recipe → dev-python/sip/sip-6.7.9.recipe
@@ -8,9 +8,9 @@ COPYRIGHT="2019 Riverbank Computing Limited"
 LICENSE="GNU GPL v2
 	GNU GPL v3
 	SIP"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/s/sip/sip-$portVersion.tar.gz"
-CHECKSUM_SHA256="42ec368520b8da4a0987218510b1b520b4981e4405086c1be384733affc2bcb0"
+CHECKSUM_SHA256="35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17"
 SOURCE_DIR="sip-$portVersion"
 PATCHES="sip-$portVersion.patchset"
 
@@ -46,8 +46,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PYTHON_PACKAGES=(python38 python39)
-PYTHON_VERSIONS=(3.8 3.9)
+PYTHON_PACKAGES=(python39)
+PYTHON_VERSIONS=(3.9)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 	pythonPackage=${PYTHON_PACKAGES[i]}
 	pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -66,44 +66,33 @@ for i in "${!PYTHON_PACKAGES[@]}"; do
 			haiku$secondaryArchSuffix
 			cmd:python$pythonVersion
 			packaging_$pythonPackage
+			ply_$pythonPackage
 			setuptools_$pythonPackage
 			toml_$pythonPackage
 			\"
 		"
 
 	BUILD_REQUIRES+="
+		build_$pythonPackage
+		installer_$pythonPackage
 		setuptools_$pythonPackage
+		wheel_$pythonPackage
 		"
 	BUILD_PREREQUIRES+="
 		cmd:python$pythonVersion
 		"
 done
 
-BUILD()
-{
-	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"
-
-		$python setup.py build
-	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/
 
-		$python setup.py install --skip-build --root=/ --prefix=$prefix \
-			--optimize=1
+		$python -m build --wheel --no-isolation --skip-dependency-check
+		$python -m installer --prefix=$prefix dist/*.whl
 
 		packageEntries $pythonPackage \
 			"$prefix/lib/$python"