diff --git a/dev-python/pyqt_builder/pyqt_builder-1.7.0.recipe b/dev-python/pyqt_builder/pyqt_builder-1.15.2.recipe similarity index 62% rename from dev-python/pyqt_builder/pyqt_builder-1.7.0.recipe rename to dev-python/pyqt_builder/pyqt_builder-1.15.2.recipe index 04338fa8c..93be02b0c 100644 --- a/dev-python/pyqt_builder/pyqt_builder-1.7.0.recipe +++ b/dev-python/pyqt_builder/pyqt_builder-1.15.2.recipe @@ -1,14 +1,13 @@ SUMMARY="The PEP 517 Compliant PyQt Build System" -DESCRIPTION="\ -PyQt-builder is the PEP 517 compliant build system for PyQt and projects that \ -extend PyQt. It extends the sip build system and uses Qt's ``qmake`` to \ -perform the actual compilation and installation of extension modules." +DESCRIPTION="PyQt-builder is the PEP 517 compliant build system for PyQt and projects that \ +extend PyQt. It extends the sip build system and uses Qt's 'qmake' to perform the actual \ +compilation and installation of extension modules." HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/" COPYRIGHT="2020 Riverbank Computing Limited" LICENSE="BSD (2-clause)" -REVISION="4" +REVISION="1" SOURCE_URI="https://pypi.io/packages/source/P/PyQt-builder/PyQt-builder-$portVersion.tar.gz" -CHECKSUM_SHA256="b6e3c826f98ff4006ecb34df491ac6062a023b63a32e9f9f50904867aff72f2e" +CHECKSUM_SHA256="746cfe83c03ebff4458d478a1c06714790ef93e458ecd5a28bc2837bac88eb74" SOURCE_DIR="PyQt-builder-$portVersion" ARCHITECTURES="any" @@ -24,9 +23,9 @@ BUILD_REQUIRES=" haiku_devel " -PYTHON_PACKAGES=(python39) -PYTHON_VERSIONS=(3.9) -defaultVersion=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]} @@ -35,11 +34,13 @@ for i in "${!PYTHON_PACKAGES[@]}"; do eval "PROVIDES_$pythonPackage=\" ${portName}_$pythonPackage = $portVersion cmd:pyqt_bundle_$pythonVersion + cmd:pyqt_qt_wheel_$pythonVersion \"" if [ $pythonVersion = $defaultVersion ]; then eval "PROVIDES_$pythonPackage+=\" cmd:pyqt_bundle + cmd:pyqt_qt_wheel \"" fi @@ -67,18 +68,26 @@ INSTALL() installLocation=$prefix/lib/$python/vendor-packages/ export PYTHONPATH=$installLocation + mkdir -p $installLocation rm -rf build - mkdir -p "$installLocation" - $python setup.py build install --root=/ --prefix="$prefix" + $python setup.py build install \ + --root=/ --prefix=$prefix - mv "$prefix"/bin/pyqt-bundle $binDir/pyqt-bundle-$pythonVersion + # Version suffix all the scripts + for f in $binDir/*; do + mv $f $f-$pythonVersion + done + + # And provide suffix-less symlinks for the default version if [ $pythonVersion = $defaultVersion ]; then - ln -sr $binDir/pyqt-bundle-$pythonVersion $binDir/pyqt-bundle + for f in $binDir/*; do + ln -sr $f ${f%-$pythonVersion} + done fi packageEntries $pythonPackage \ - "$prefix"/lib/$python \ + $prefix/lib/python* \ $binDir done }