From 0eee9af05158a00a83768d1c080fcc362122d443 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 24 Jan 2021 18:11:14 +0100 Subject: [PATCH] pyqt5: bump version rename from pyqt, switch to python 3.8 --- dev-python/pyqt/pyqt-5.11.2.recipe | 254 ----------------- dev-python/pyqt/pyqt-5.12.1.recipe | 262 ------------------ dev-python/pyqt/pyqt-5.7.1.recipe | 217 --------------- dev-python/pyqt/pyqt-5.8.2.recipe | 220 --------------- dev-python/pyqt/pyqt-5.9.1.recipe | 222 --------------- ...pyqt-5.13.1.recipe => pyqt5-5.15.2.recipe} | 156 +++-------- 6 files changed, 40 insertions(+), 1291 deletions(-) delete mode 100644 dev-python/pyqt/pyqt-5.11.2.recipe delete mode 100644 dev-python/pyqt/pyqt-5.12.1.recipe delete mode 100644 dev-python/pyqt/pyqt-5.7.1.recipe delete mode 100644 dev-python/pyqt/pyqt-5.8.2.recipe delete mode 100644 dev-python/pyqt/pyqt-5.9.1.recipe rename dev-python/pyqt/{pyqt-5.13.1.recipe => pyqt5-5.15.2.recipe} (58%) diff --git a/dev-python/pyqt/pyqt-5.11.2.recipe b/dev-python/pyqt/pyqt-5.11.2.recipe deleted file mode 100644 index 7d6335231..000000000 --- a/dev-python/pyqt/pyqt-5.11.2.recipe +++ /dev/null @@ -1,254 +0,0 @@ -SUMMARY="Python v2 and v3 bindings for Qt application framework" -DESCRIPTION="PyQt combines all the advantages of Qt and Python. A programmer \ -has all the power of Qt, but is able to exploit it with the \ -simplicity of Python." -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" -COPYRIGHT="2015-2018 Riverbank Computing Limited" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://downloads.sourceforge.net/pyqt/PyQt5_gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="7caa581155c3433716b7e6aba71fe1378cd7d92f4155c266d60e5cffb64e9603" -SOURCE_DIR="PyQt5_gpl-$portVersion" -PYTHON3_VERSION="3.6" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -portVersionCompat="$portVersion compat >= ${portVersion%%.*}" -qtVersion="${portVersion%.*}" - -PROVIDES=" - pyqt${secondaryArchSuffix} = $portVersionCompat - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libQt5Bluetooth$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Designer$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Help$secondaryArchSuffix - lib:libQt5Location$secondaryArchSuffix - lib:libQt5Multimedia$secondaryArchSuffix - lib:libQt5MultimediaWidgets$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Nfc$secondaryArchSuffix - lib:libQt5OpenGL$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Positioning$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5QuickWidgets$secondaryArchSuffix - lib:libQt5Sensors$secondaryArchSuffix - lib:libQt5SerialPort$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Test$secondaryArchSuffix - lib:libQt5WebChannel$secondaryArchSuffix - lib:libQt5WebKit$secondaryArchSuffix - lib:libQt5WebKitWidgets$secondaryArchSuffix - lib:libQt5WebSockets$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - lib:libQt5XmlPatterns$secondaryArchSuffix - lib:libGL${secondaryArchSuffix} - " - -PROVIDES_python=" - pyqt${secondaryArchSuffix}_python = $portVersionCompat - python_pyqt${secondaryArchSuffix} - cmd:python2_pylupdate5$commandSuffix - cmd:python2_pyrcc5$commandSuffix - cmd:python2_pyuic5$commandSuffix - " -REQUIRES_python=" - pyqt$secondaryArchSuffix == $portVersion base - enum34_python - sip_pyqt_python >= 4.19 - cmd:python2 - $REQUIRES - " -REPLACES_python=" - python_pyqt${secondaryArchSuffix} - " - -PROVIDES_python3=" - pyqt${secondaryArchSuffix}_python3 = $portVersionCompat - python3_pyqt${secondaryArchSuffix} - cmd:pylupdate5$commandSuffix - cmd:pyrcc5$commandSuffix - cmd:pyuic5$commandSuffix - " -REQUIRES_python3=" - haiku${secondaryArchSuffix} - pyqt$secondaryArchSuffix == $portVersion base - sip_pyqt_python3 >= 4.19 - cmd:python$PYTHON3_VERSION - $REQUIRES - " -REPLACES_python3=" - python3_pyqt${secondaryArchSuffix} - " - -if [ "$targetArchitecture" = "x86_gcc2" ]; then - PROVIDES_python+=" - pyqt_python = $portVersionCompat - " - - PROVIDES_python3+=" - pyqt_python3 = $portVersionCompat - " -fi - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - enum34_python - setuptools_python - sip_pyqt_python # >= 4.19 - setuptools_python3 - sip_pyqt_python3 # >= 4.19 - devel:libQt5Bluetooth$secondaryArchSuffix >= $qtVersion - devel:libQt5Core$secondaryArchSuffix >= $qtVersion - devel:libQt5Designer$secondaryArchSuffix >= $qtVersion - devel:libQt5DBus$secondaryArchSuffix >= $qtVersion - devel:libQt5Gui$secondaryArchSuffix >= $qtVersion - devel:libQt5Help$secondaryArchSuffix >= $qtVersion - devel:libQt5Location$secondaryArchSuffix >= $qtVersion - devel:libQt5Multimedia$secondaryArchSuffix >= $qtVersion - devel:libQt5MultimediaWidgets$secondaryArchSuffix >= $qtVersion - devel:libQt5Network$secondaryArchSuffix >= $qtVersion - devel:libQt5Nfc$secondaryArchSuffix >= $qtVersion - devel:libQt5OpenGL$secondaryArchSuffix >= $qtVersion - devel:libQt5PrintSupport$secondaryArchSuffix >= $qtVersion - devel:libQt5Positioning$secondaryArchSuffix >= $qtVersion - devel:libQt5Qml$secondaryArchSuffix >= $qtVersion - devel:libQt5Quick$secondaryArchSuffix >= $qtVersion - devel:libQt5QuickWidgets$secondaryArchSuffix >= $qtVersion - devel:libQt5Sensors$secondaryArchSuffix >= $qtVersion - devel:libQt5SerialPort$secondaryArchSuffix >= $qtVersion - devel:libQt5Sql$secondaryArchSuffix >= $qtVersion - devel:libQt5Svg$secondaryArchSuffix >= $qtVersion - devel:libQt5Test$secondaryArchSuffix >= $qtVersion - devel:libQt5WebChannel$secondaryArchSuffix >= $qtVersion - devel:libQt5WebKit$secondaryArchSuffix - devel:libQt5WebKitWidgets$secondaryArchSuffix - devel:libQt5WebSockets$secondaryArchSuffix >= $qtVersion - devel:libQt5Widgets$secondaryArchSuffix >= $qtVersion - devel:libQt5Xml$secondaryArchSuffix >= $qtVersion - devel:libQt5XmlPatterns$secondaryArchSuffix >= $qtVersion - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:python$PYTHON3_VERSION - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:sip - cmd:qmake${secondaryArchSuffix} >= 5 - " - -PATCH() -{ - # disable checking for sip, since it doesn't work for python2 as __init__.py - # is not provided by sip. - sed -i 's|from PyQt5 import sip|pass|g' configure.py -} - -BUILD() -{ - OLDPYTHONPATH=$PYTHONPATH - cp -R $sourceDir ${sourceDir}_build - cp -R $sourceDir ${sourceDir}_build3 - - cd ${sourceDir}_build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$commandBinDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/cmd~sip/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - --no-dist-info \ - #--verbose - - make $jobArgs - - cd ${sourceDir}_build3 - - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$commandBinDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/cmd~sip/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - --no-dist-info \ - #--verbose - - make $jobArgs -} - -INSTALL() -{ - OLDPYTHONPATH=$PYTHONPATH - cd ${sourceDir}_build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - for file in pylupdate5 pyrcc5 pyuic5; do - mv $commandBinDir/$file $commandBinDir/python2-$file - done - - packageEntries python \ - $installLocation \ - $commandBinDir/python2* - - rmdir $prefix/lib/python$pythonVersion - - cd ${sourceDir}_build3 - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - packageEntries python3 \ - $installLocation \ - $commandBinDir - - rmdir $prefix/lib/python$pythonVersion - -} diff --git a/dev-python/pyqt/pyqt-5.12.1.recipe b/dev-python/pyqt/pyqt-5.12.1.recipe deleted file mode 100644 index f950016f3..000000000 --- a/dev-python/pyqt/pyqt-5.12.1.recipe +++ /dev/null @@ -1,262 +0,0 @@ -SUMMARY="Python v2 and v3 bindings for Qt application framework" -DESCRIPTION="PyQt combines all the advantages of Qt and Python. A programmer \ -has all the power of Qt, but is able to exploit it with the \ -simplicity of Python." -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" -COPYRIGHT="2015-2018 Riverbank Computing Limited" -LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="https://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="3718ce847d824090fd5f95ff3f13847ee75c2507368d4cbaeb48338f506e59bf" -SOURCE_DIR="PyQt5_gpl-$portVersion" -PYTHON3_VERSION="3.6" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -portVersionCompat="$portVersion compat >= ${portVersion%%.*}" -qtVersion="${portVersion%.*}" - -PROVIDES=" - pyqt${secondaryArchSuffix} = $portVersionCompat - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libQt5Bluetooth$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Designer$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Help$secondaryArchSuffix - lib:libQt5Location$secondaryArchSuffix - lib:libQt5Multimedia$secondaryArchSuffix - lib:libQt5MultimediaWidgets$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Nfc$secondaryArchSuffix -# lib:libQt5OpenGL$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Positioning$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5QuickWidgets$secondaryArchSuffix - lib:libQt5Sensors$secondaryArchSuffix - lib:libQt5SerialPort$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Test$secondaryArchSuffix - lib:libQt5WebChannel$secondaryArchSuffix - lib:libQt5WebKit$secondaryArchSuffix - lib:libQt5WebKitWidgets$secondaryArchSuffix - lib:libQt5WebSockets$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - lib:libQt5XmlPatterns$secondaryArchSuffix -# lib:libGL${secondaryArchSuffix} - " - -PROVIDES_python=" - pyqt${secondaryArchSuffix}_python = $portVersionCompat - python_pyqt${secondaryArchSuffix} - cmd:python2_pylupdate5$commandSuffix - cmd:python2_pyrcc5$commandSuffix - cmd:python2_pyuic5$commandSuffix - " -REQUIRES_python=" - pyqt$secondaryArchSuffix == $portVersion base - enum34_python - sip_pyqt_python >= 4.19.14 - cmd:python2 - $REQUIRES - " -REPLACES_python=" - python_pyqt${secondaryArchSuffix} - " - -PROVIDES_python3=" - pyqt${secondaryArchSuffix}_python3 = $portVersionCompat - python3_pyqt${secondaryArchSuffix} - cmd:pylupdate5$commandSuffix - cmd:pyrcc5$commandSuffix - cmd:pyuic5$commandSuffix - " -REQUIRES_python3=" - haiku${secondaryArchSuffix} - pyqt$secondaryArchSuffix == $portVersion base - sip_pyqt_python3 >= 4.19.14 - cmd:python$PYTHON3_VERSION - $REQUIRES - " -REPLACES_python3=" - python3_pyqt${secondaryArchSuffix} - " - -if [ "$targetArchitecture" = "x86_gcc2" ]; then - PROVIDES_python+=" - pyqt_python = $portVersionCompat - " - - PROVIDES_python3+=" - pyqt_python3 = $portVersionCompat - " -fi - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - enum34_python - setuptools_python - sip_pyqt_python >= 4.19.14 - setuptools_python3 - sip_pyqt_python3 >= 4.19.14 - devel:libQt5Bluetooth$secondaryArchSuffix >= $qtVersion - devel:libQt5Core$secondaryArchSuffix >= $qtVersion - devel:libQt5Designer$secondaryArchSuffix >= $qtVersion - devel:libQt5DBus$secondaryArchSuffix >= $qtVersion - devel:libQt5Gui$secondaryArchSuffix >= $qtVersion - devel:libQt5Help$secondaryArchSuffix >= $qtVersion - devel:libQt5Location$secondaryArchSuffix >= $qtVersion - devel:libQt5Multimedia$secondaryArchSuffix >= $qtVersion - devel:libQt5MultimediaWidgets$secondaryArchSuffix >= $qtVersion - devel:libQt5Network$secondaryArchSuffix >= $qtVersion - devel:libQt5Nfc$secondaryArchSuffix >= $qtVersion -# devel:libQt5OpenGL$secondaryArchSuffix >= $qtVersion - devel:libQt5PrintSupport$secondaryArchSuffix >= $qtVersion - devel:libQt5Positioning$secondaryArchSuffix >= $qtVersion - devel:libQt5Qml$secondaryArchSuffix >= $qtVersion - devel:libQt5Quick$secondaryArchSuffix >= $qtVersion - devel:libQt5QuickWidgets$secondaryArchSuffix >= $qtVersion - devel:libQt5Sensors$secondaryArchSuffix >= $qtVersion - devel:libQt5SerialPort$secondaryArchSuffix >= $qtVersion - devel:libQt5Sql$secondaryArchSuffix >= $qtVersion - devel:libQt5Svg$secondaryArchSuffix >= $qtVersion - devel:libQt5Test$secondaryArchSuffix >= $qtVersion - devel:libQt5WebChannel$secondaryArchSuffix >= $qtVersion - devel:libQt5WebKit$secondaryArchSuffix - devel:libQt5WebKitWidgets$secondaryArchSuffix - devel:libQt5WebSockets$secondaryArchSuffix >= $qtVersion - devel:libQt5Widgets$secondaryArchSuffix >= $qtVersion - devel:libQt5Xml$secondaryArchSuffix >= $qtVersion - devel:libQt5XmlPatterns$secondaryArchSuffix >= $qtVersion -# devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:python$PYTHON3_VERSION - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:sip - cmd:qmake${secondaryArchSuffix} >= 5 - " - -PATCH() -{ - # disable checking for sip, since it doesn't work for python2 as __init__.py - # is not provided by sip. - sed -i 's|from PyQt5 import sip|pass|g' configure.py -} - -BUILD() -{ - OLDPYTHONPATH=$PYTHONPATH - cp -R $sourceDir ${sourceDir}_build - cp -R $sourceDir ${sourceDir}_build3 - - cd ${sourceDir}_build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$commandBinDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/cmd~sip/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - --no-dist-info \ - --disable=QtOpenGL \ - --disable=_QOpenGLFunctions_2_0 \ - --disable=_QOpenGLFunctions_2_1 \ - --disable=_QOpenGLFunctions_4_1_Core \ - #--verbose - - make $jobArgs - - cd ${sourceDir}_build3 - - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$commandBinDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/cmd~sip/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - --no-dist-info \ - --disable=QtOpenGL \ - --disable=_QOpenGLFunctions_2_0 \ - --disable=_QOpenGLFunctions_2_1 \ - --disable=_QOpenGLFunctions_4_1_Core \ - #--verbose - - make $jobArgs -} - -INSTALL() -{ - OLDPYTHONPATH=$PYTHONPATH - cd ${sourceDir}_build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - for file in pylupdate5 pyrcc5 pyuic5; do - mv $commandBinDir/$file $commandBinDir/python2-$file - done - - packageEntries python \ - $installLocation \ - $commandBinDir/python2* - - rmdir $prefix/lib/python$pythonVersion - - cd ${sourceDir}_build3 - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - packageEntries python3 \ - $installLocation \ - $commandBinDir - - rmdir $prefix/lib/python$pythonVersion - -} diff --git a/dev-python/pyqt/pyqt-5.7.1.recipe b/dev-python/pyqt/pyqt-5.7.1.recipe deleted file mode 100644 index 67e8692fb..000000000 --- a/dev-python/pyqt/pyqt-5.7.1.recipe +++ /dev/null @@ -1,217 +0,0 @@ -SUMMARY="Python v2 and v3 bindings for Qt application framework" -DESCRIPTION="PyQt combines all the advantages of Qt and Python. A programmer \ -has all the power of Qt, but is able to exploit it with the \ -simplicity of Python." -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" -COPYRIGHT="2015-2016 Riverbank Computing Limited" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$portVersion/PyQt5_gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14" -SOURCE_DIR="PyQt5_gpl-$portVersion" - -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" - -PROVIDES=" - pyqt${secondaryArchSuffix} = $portVersion - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libQt5Bluetooth$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Designer$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Help$secondaryArchSuffix - lib:libQt5Location$secondaryArchSuffix - lib:libQt5Multimedia$secondaryArchSuffix - lib:libQt5MultimediaWidgets$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Nfc$secondaryArchSuffix - lib:libQt5OpenGL$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Positioning$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5QuickWidgets$secondaryArchSuffix - lib:libQt5Sensors$secondaryArchSuffix - lib:libQt5SerialPort$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Test$secondaryArchSuffix - lib:libQt5WebChannel$secondaryArchSuffix - lib:libQt5WebKit$secondaryArchSuffix - lib:libQt5WebKitWidgets$secondaryArchSuffix - lib:libQt5WebSockets$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - lib:libQt5XmlPatterns$secondaryArchSuffix - lib:libGL${secondaryArchSuffix} - " - -PROVIDES_python=" - pyqt_python${secondaryArchSuffix} = $portVersion - python_pyqt${secondaryArchSuffix} - cmd:python2_pylupdate5${secondaryArchSuffix} - cmd:python2_pyrcc5${secondaryArchSuffix} - cmd:python2_pyuic5${secondaryArchSuffix} - " -REQUIRES_python=" - pyqt$secondaryArchSuffix == $portVersion base - sip_python >= 4.19 - cmd:python2 - " -REPLACES_python=" - python_pyqt${secondaryArchSuffix} - " - -PROVIDES_python3=" - pyqt_python3${secondaryArchSuffix} = $portVersion - python3_pyqt${secondaryArchSuffix} - cmd:pylupdate5${secondaryArchSuffix} - cmd:pyrcc5${secondaryArchSuffix} - cmd:pyuic5${secondaryArchSuffix} - " -REQUIRES_python3=" - haiku${secondaryArchSuffix} - pyqt$secondaryArchSuffix == $portVersion base - sip_python3 >= 4.19 - cmd:python3 - " -REPLACES_python3=" - python3_pyqt${secondaryArchSuffix} - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - setuptools_python - sip_python # >= 4.19 - setuptools_python3 - sip_python3 # >= 4.19 - devel:libQt5Bluetooth$secondaryArchSuffix >= 5.7 - devel:libQt5Core$secondaryArchSuffix >= 5.7 - devel:libQt5Designer$secondaryArchSuffix >= 5.7 - devel:libQt5DBus$secondaryArchSuffix >= 5.7 - devel:libQt5Gui$secondaryArchSuffix >= 5.7 - devel:libQt5Help$secondaryArchSuffix >= 5.7 - devel:libQt5Location$secondaryArchSuffix >= 5.7 - devel:libQt5Multimedia$secondaryArchSuffix >= 5.7 - devel:libQt5MultimediaWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5Network$secondaryArchSuffix >= 5.7 - devel:libQt5Nfc$secondaryArchSuffix >= 5.7 - devel:libQt5OpenGL$secondaryArchSuffix >= 5.7 - devel:libQt5PrintSupport$secondaryArchSuffix >= 5.7 - devel:libQt5Positioning$secondaryArchSuffix >= 5.7 - devel:libQt5Qml$secondaryArchSuffix >= 5.7 - devel:libQt5Quick$secondaryArchSuffix >= 5.7 - devel:libQt5QuickWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5Sensors$secondaryArchSuffix >= 5.7 - devel:libQt5SerialPort$secondaryArchSuffix >= 5.7 - devel:libQt5Sql$secondaryArchSuffix >= 5.7 - devel:libQt5Svg$secondaryArchSuffix >= 5.7 - devel:libQt5Test$secondaryArchSuffix >= 5.7 - devel:libQt5WebChannel$secondaryArchSuffix >= 5.7 - devel:libQt5WebKit$secondaryArchSuffix >= 5.7 - devel:libQt5WebKitWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5WebSockets$secondaryArchSuffix >= 5.7 - devel:libQt5Widgets$secondaryArchSuffix >= 5.7 - devel:libQt5Xml$secondaryArchSuffix >= 5.7 - devel:libQt5XmlPatterns$secondaryArchSuffix >= 5.7 - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:python3 - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:qmake${secondaryArchSuffix} >= 5 - " - -BUILD() -{ - OLDPYTHONPATH=$PYTHONPATH - mkdir -p build; cd build - - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $portPackageLinksDir/cmd~python2/bin/python2 ../configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/sip_python/bin/python2-sip \ - --stubsdir=$installLocation/PyQt5 \ - #--verbose - - make $jobArgs - - mkdir -p ../build3; cd ../build3 - - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python3/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $portPackageLinksDir/cmd~python3/bin/python3 ../configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/sip_python3/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - #--verbose - - make $jobArgs -} - -INSTALL() -{ - OLDPYTHONPATH=$PYTHONPATH - cd build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - for file in pylupdate5 pyrcc5 pyuic5; do - mv $binDir/$file $binDir/python2-$file - done - - packageEntries python \ - $installLocation \ - $binDir/python2* - - rmdir $prefix/lib/python$pythonVersion - - cd ../build3 - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python3/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - packageEntries python3 \ - $installLocation \ - $binDir - - rmdir $prefix/lib/python$pythonVersion - -} diff --git a/dev-python/pyqt/pyqt-5.8.2.recipe b/dev-python/pyqt/pyqt-5.8.2.recipe deleted file mode 100644 index 92d9e9a8e..000000000 --- a/dev-python/pyqt/pyqt-5.8.2.recipe +++ /dev/null @@ -1,220 +0,0 @@ -SUMMARY="Python v2 and v3 bindings for Qt application framework" -DESCRIPTION="PyQt combines all the advantages of Qt and Python. A programmer \ -has all the power of Qt, but is able to exploit it with the \ -simplicity of Python." -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" -COPYRIGHT="2015-2017 Riverbank Computing Limited" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$portVersion/PyQt5_gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8" -SOURCE_DIR="PyQt5_gpl-$portVersion" -PYTHON3_VERSION="3.6" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" - -PROVIDES=" - pyqt${secondaryArchSuffix} = $portVersion - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libQt5Bluetooth$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Designer$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Help$secondaryArchSuffix - lib:libQt5Location$secondaryArchSuffix - lib:libQt5Multimedia$secondaryArchSuffix - lib:libQt5MultimediaWidgets$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Nfc$secondaryArchSuffix - lib:libQt5OpenGL$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Positioning$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5QuickWidgets$secondaryArchSuffix - lib:libQt5Sensors$secondaryArchSuffix - lib:libQt5SerialPort$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Test$secondaryArchSuffix - lib:libQt5WebChannel$secondaryArchSuffix - lib:libQt5WebKit$secondaryArchSuffix - lib:libQt5WebKitWidgets$secondaryArchSuffix - lib:libQt5WebSockets$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - lib:libQt5XmlPatterns$secondaryArchSuffix - lib:libGL${secondaryArchSuffix} - " - -PROVIDES_python=" - pyqt_python${secondaryArchSuffix} = $portVersion - python_pyqt${secondaryArchSuffix} - cmd:python2_pylupdate5${secondaryArchSuffix} - cmd:python2_pyrcc5${secondaryArchSuffix} - cmd:python2_pyuic5${secondaryArchSuffix} - " -REQUIRES_python=" - pyqt$secondaryArchSuffix == $portVersion base - sip_python >= 4.19 - cmd:python2 - $REQUIRES - " -REPLACES_python=" - python_pyqt${secondaryArchSuffix} - " - -PROVIDES_python3=" - pyqt_python3${secondaryArchSuffix} = $portVersion - python3_pyqt${secondaryArchSuffix} - cmd:pylupdate5${secondaryArchSuffix} - cmd:pyrcc5${secondaryArchSuffix} - cmd:pyuic5${secondaryArchSuffix} - " -REQUIRES_python3=" - haiku${secondaryArchSuffix} - pyqt$secondaryArchSuffix == $portVersion base - sip_python3 >= 4.19 - cmd:python$PYTHON3_VERSION - $REQUIRES - " -REPLACES_python3=" - python3_pyqt${secondaryArchSuffix} - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - setuptools_python - sip_python # >= 4.19 - setuptools_python3 - sip_python3 # >= 4.19 - devel:libQt5Bluetooth$secondaryArchSuffix >= 5.7 - devel:libQt5Core$secondaryArchSuffix >= 5.7 - devel:libQt5Designer$secondaryArchSuffix >= 5.7 - devel:libQt5DBus$secondaryArchSuffix >= 5.7 - devel:libQt5Gui$secondaryArchSuffix >= 5.7 - devel:libQt5Help$secondaryArchSuffix >= 5.7 - devel:libQt5Location$secondaryArchSuffix >= 5.7 - devel:libQt5Multimedia$secondaryArchSuffix >= 5.7 - devel:libQt5MultimediaWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5Network$secondaryArchSuffix >= 5.7 - devel:libQt5Nfc$secondaryArchSuffix >= 5.7 - devel:libQt5OpenGL$secondaryArchSuffix >= 5.7 - devel:libQt5PrintSupport$secondaryArchSuffix >= 5.7 - devel:libQt5Positioning$secondaryArchSuffix >= 5.7 - devel:libQt5Qml$secondaryArchSuffix >= 5.7 - devel:libQt5Quick$secondaryArchSuffix >= 5.7 - devel:libQt5QuickWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5Sensors$secondaryArchSuffix >= 5.7 - devel:libQt5SerialPort$secondaryArchSuffix >= 5.7 - devel:libQt5Sql$secondaryArchSuffix >= 5.7 - devel:libQt5Svg$secondaryArchSuffix >= 5.7 - devel:libQt5Test$secondaryArchSuffix >= 5.7 - devel:libQt5WebChannel$secondaryArchSuffix >= 5.7 - devel:libQt5WebKit$secondaryArchSuffix >= 5.7 - devel:libQt5WebKitWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5WebSockets$secondaryArchSuffix >= 5.7 - devel:libQt5Widgets$secondaryArchSuffix >= 5.7 - devel:libQt5Xml$secondaryArchSuffix >= 5.7 - devel:libQt5XmlPatterns$secondaryArchSuffix >= 5.7 - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:python$PYTHON3_VERSION - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:qmake${secondaryArchSuffix} >= 5 - " - -BUILD() -{ - OLDPYTHONPATH=$PYTHONPATH - mkdir -p build; cd build - - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $portPackageLinksDir/cmd~python2/bin/python2 ../configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/sip_python/bin/python2-sip \ - --stubsdir=$installLocation/PyQt5 \ - #--verbose - - make $jobArgs - - mkdir -p ../build3; cd ../build3 - - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python ../configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/sip_python3/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - #--verbose - - make $jobArgs -} - -INSTALL() -{ - OLDPYTHONPATH=$PYTHONPATH - cd build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - for file in pylupdate5 pyrcc5 pyuic5; do - mv $binDir/$file $binDir/python2-$file - done - - packageEntries python \ - $installLocation \ - $binDir/python2* - - rmdir $prefix/lib/python$pythonVersion - - cd ../build3 - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - packageEntries python3 \ - $installLocation \ - $binDir - - rmdir $prefix/lib/python$pythonVersion - -} diff --git a/dev-python/pyqt/pyqt-5.9.1.recipe b/dev-python/pyqt/pyqt-5.9.1.recipe deleted file mode 100644 index 224eccdc4..000000000 --- a/dev-python/pyqt/pyqt-5.9.1.recipe +++ /dev/null @@ -1,222 +0,0 @@ -SUMMARY="Python v2 and v3 bindings for Qt application framework" -DESCRIPTION="PyQt combines all the advantages of Qt and Python. A programmer \ -has all the power of Qt, but is able to exploit it with the \ -simplicity of Python." -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" -COPYRIGHT="2015-2017 Riverbank Computing Limited" -LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="https://newcontinuum.dl.sourceforge.net/project/pyqt/PyQt5/PyQt-$portVersion/PyQt5_gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="5fc009448ea78c8fd48eb7083a7b93734dbd61290a9a21dab674096a7762b4ca" -SOURCE_DIR="PyQt5_gpl-$portVersion" -PYTHON3_VERSION="3.6" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" - -PROVIDES=" - pyqt${secondaryArchSuffix} = $portVersion - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libQt5Bluetooth$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Designer$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Help$secondaryArchSuffix - lib:libQt5Location$secondaryArchSuffix - lib:libQt5Multimedia$secondaryArchSuffix - lib:libQt5MultimediaWidgets$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5Nfc$secondaryArchSuffix - lib:libQt5OpenGL$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Positioning$secondaryArchSuffix - lib:libQt5Qml$secondaryArchSuffix - lib:libQt5Quick$secondaryArchSuffix - lib:libQt5QuickWidgets$secondaryArchSuffix - lib:libQt5Sensors$secondaryArchSuffix - lib:libQt5SerialPort$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5Svg$secondaryArchSuffix - lib:libQt5Test$secondaryArchSuffix - lib:libQt5WebChannel$secondaryArchSuffix - lib:libQt5WebKit$secondaryArchSuffix - lib:libQt5WebKitWidgets$secondaryArchSuffix - lib:libQt5WebSockets$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - lib:libQt5XmlPatterns$secondaryArchSuffix - lib:libGL${secondaryArchSuffix} - " - -PROVIDES_python=" - pyqt_python${secondaryArchSuffix} = $portVersion - python_pyqt${secondaryArchSuffix} - cmd:python2_pylupdate5${secondaryArchSuffix} - cmd:python2_pyrcc5${secondaryArchSuffix} - cmd:python2_pyuic5${secondaryArchSuffix} - " -REQUIRES_python=" - pyqt$secondaryArchSuffix == $portVersion base - sip_python >= 4.19 - cmd:python2 - $REQUIRES - " -REPLACES_python=" - python_pyqt${secondaryArchSuffix} - " - -PROVIDES_python3=" - pyqt_python3${secondaryArchSuffix} = $portVersion - python3_pyqt${secondaryArchSuffix} - cmd:pylupdate5${secondaryArchSuffix} - cmd:pyrcc5${secondaryArchSuffix} - cmd:pyuic5${secondaryArchSuffix} - " -REQUIRES_python3=" - haiku${secondaryArchSuffix} - pyqt$secondaryArchSuffix == $portVersion base - sip_python3 >= 4.19 - cmd:python$PYTHON3_VERSION - $REQUIRES - " -REPLACES_python3=" - python3_pyqt${secondaryArchSuffix} - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - setuptools_python - sip_python # >= 4.19 - setuptools_python3 - sip_python3 # >= 4.19 - devel:libQt5Bluetooth$secondaryArchSuffix >= 5.7 - devel:libQt5Core$secondaryArchSuffix >= 5.7 - devel:libQt5Designer$secondaryArchSuffix >= 5.7 - devel:libQt5DBus$secondaryArchSuffix >= 5.7 - devel:libQt5Gui$secondaryArchSuffix >= 5.7 - devel:libQt5Help$secondaryArchSuffix >= 5.7 - devel:libQt5Location$secondaryArchSuffix >= 5.7 - devel:libQt5Multimedia$secondaryArchSuffix >= 5.7 - devel:libQt5MultimediaWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5Network$secondaryArchSuffix >= 5.7 - devel:libQt5Nfc$secondaryArchSuffix >= 5.7 - devel:libQt5OpenGL$secondaryArchSuffix >= 5.7 - devel:libQt5PrintSupport$secondaryArchSuffix >= 5.7 - devel:libQt5Positioning$secondaryArchSuffix >= 5.7 - devel:libQt5Qml$secondaryArchSuffix >= 5.7 - devel:libQt5Quick$secondaryArchSuffix >= 5.7 - devel:libQt5QuickWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5Sensors$secondaryArchSuffix >= 5.7 - devel:libQt5SerialPort$secondaryArchSuffix >= 5.7 - devel:libQt5Sql$secondaryArchSuffix >= 5.7 - devel:libQt5Svg$secondaryArchSuffix >= 5.7 - devel:libQt5Test$secondaryArchSuffix >= 5.7 - devel:libQt5WebChannel$secondaryArchSuffix >= 5.7 - devel:libQt5WebKit$secondaryArchSuffix >= 5.7 - devel:libQt5WebKitWidgets$secondaryArchSuffix >= 5.7 - devel:libQt5WebSockets$secondaryArchSuffix >= 5.7 - devel:libQt5Widgets$secondaryArchSuffix >= 5.7 - devel:libQt5Xml$secondaryArchSuffix >= 5.7 - devel:libQt5XmlPatterns$secondaryArchSuffix >= 5.7 - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:python$PYTHON3_VERSION - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:qmake${secondaryArchSuffix} >= 5 - " - -BUILD() -{ - OLDPYTHONPATH=$PYTHONPATH - cp -R $sourceDir ${sourceDir}_build - cp -R $sourceDir ${sourceDir}_build3 - - cd ${sourceDir}_build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/sip_python/bin/python2-sip \ - --stubsdir=$installLocation/PyQt5 \ - #--verbose - - make $jobArgs - - cd ${sourceDir}_build3 - - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/sip_python3/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - #--verbose - - make $jobArgs -} - -INSTALL() -{ - OLDPYTHONPATH=$PYTHONPATH - cd ${sourceDir}_build - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - for file in pylupdate5 pyrcc5 pyuic5; do - mv $binDir/$file $binDir/python2-$file - done - - packageEntries python \ - $installLocation \ - $binDir/python2* - - rmdir $prefix/lib/python$pythonVersion - - cd ${sourceDir}_build3 - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - packageEntries python3 \ - $installLocation \ - $binDir - - rmdir $prefix/lib/python$pythonVersion - -} diff --git a/dev-python/pyqt/pyqt-5.13.1.recipe b/dev-python/pyqt/pyqt5-5.15.2.recipe similarity index 58% rename from dev-python/pyqt/pyqt-5.13.1.recipe rename to dev-python/pyqt/pyqt5-5.15.2.recipe index 9b8a59f3a..3ab770c6d 100644 --- a/dev-python/pyqt/pyqt-5.13.1.recipe +++ b/dev-python/pyqt/pyqt5-5.15.2.recipe @@ -5,11 +5,11 @@ simplicity of Python." HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/" COPYRIGHT="2015-2019 Riverbank Computing Limited" LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="https://www.riverbankcomputing.com/static/Downloads/PyQt5/$portVersion/PyQt5_gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="54b7f456341b89eeb3930e786837762ea67f235e886512496c4152ebe106d4af" -SOURCE_DIR="PyQt5_gpl-$portVersion" -PYTHON3_VERSION="3.7" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$portVersion.tar.gz" +CHECKSUM_SHA256="372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc" +SOURCE_DIR="PyQt5-$portVersion" +PYTHON3_VERSION="3.8" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -25,10 +25,10 @@ portVersionCompat="$portVersion compat >= ${portVersion%%.*}" qtVersion="${portVersion%.*}" PROVIDES=" - pyqt${secondaryArchSuffix} = $portVersionCompat + pyqt5$secondaryArchSuffix = $portVersionCompat " REQUIRES=" - haiku${secondaryArchSuffix} + haiku$secondaryArchSuffix lib:libQt5Bluetooth$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Designer$secondaryArchSuffix @@ -60,60 +60,37 @@ REQUIRES=" lib:libQt5XmlPatterns$secondaryArchSuffix # lib:libGL${secondaryArchSuffix} " - -PROVIDES_python=" - pyqt${secondaryArchSuffix}_python = $portVersionCompat - python_pyqt${secondaryArchSuffix} - cmd:python2_pylupdate5$commandSuffix - cmd:python2_pyrcc5$commandSuffix - cmd:python2_pyuic5$commandSuffix +REPLACES=" + pyqt$secondaryArchSuffix " -REQUIRES_python=" - pyqt$secondaryArchSuffix == $portVersion base - enum34_python - sip_pyqt_python >= 4.19.19 - cmd:python2 - $REQUIRES - " -REPLACES_python=" - python_pyqt${secondaryArchSuffix} - " - -PROVIDES_python3=" - pyqt${secondaryArchSuffix}_python3 = $portVersionCompat - python3_pyqt${secondaryArchSuffix} +PROVIDES_python38=" + pyqt5${secondaryArchSuffix}_python38 = $portVersionCompat cmd:pylupdate5$commandSuffix cmd:pyrcc5$commandSuffix cmd:pyuic5$commandSuffix " -REQUIRES_python3=" - haiku${secondaryArchSuffix} - pyqt$secondaryArchSuffix == $portVersion base - sip_pyqt_python3 >= 4.19.19 +REQUIRES_python38=" + haiku$secondaryArchSuffix + pyqt5$secondaryArchSuffix == $portVersion base + pyqt5_sip_python38 cmd:python$PYTHON3_VERSION $REQUIRES " -REPLACES_python3=" - python3_pyqt${secondaryArchSuffix} +REPLACES_python38=" + pyqt${secondaryArchSuffix}_python3 " if [ "$targetArchitecture" = "x86_gcc2" ]; then - PROVIDES_python+=" - pyqt_python = $portVersionCompat - " - - PROVIDES_python3+=" - pyqt_python3 = $portVersionCompat + PROVIDES_python38+=" + pyqt5_python38 = $portVersionCompat " fi BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - enum34_python - setuptools_python - sip_pyqt_python >= 4.19.19 - setuptools_python3 - sip_pyqt_python3 >= 4.19.19 + pyqt_builder_python38 + setuptools_python38 + sip_python38 >= 6 devel:libQt5Bluetooth$secondaryArchSuffix >= $qtVersion devel:libQt5Core$secondaryArchSuffix >= $qtVersion devel:libQt5Designer$secondaryArchSuffix >= $qtVersion @@ -146,7 +123,6 @@ BUILD_REQUIRES=" # devel:libGL${secondaryArchSuffix} " BUILD_PREREQUIRES=" - cmd:python2 cmd:python$PYTHON3_VERSION cmd:gcc${secondaryArchSuffix} cmd:make @@ -165,62 +141,28 @@ PATCH() BUILD() { OLDPYTHONPATH=$PYTHONPATH - cp -R $sourceDir ${sourceDir}_build - cp -R $sourceDir ${sourceDir}_build3 local packageLinksDir=$(dirname $portPackageLinksDir) - local pythonPackageName="${portName}_python-$portFullVersion" - local python3PackageName="${portName}_python3-$portFullVersion" + local python3PackageName="${portName}_python38-$portFullVersion" - cd ${sourceDir}_build # GENERIC: all python_setuptools-based installs need this - python=$packageLinksDir/$pythonPackageName/cmd~python2/bin/python2 + python=$packageLinksDir/$python3PackageName/cmd~python$PYTHON3_VERSION/bin/python$PYTHON3_VERSION pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + installLocation=/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$OLDPYTHONPATH - $python configure.py \ + sip-build \ --confirm-license \ --no-designer-plugin \ --no-qml-plugin \ - --bindir=$commandBinDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/cmd~sip/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - --no-dist-info \ + --no-make \ + --target-dir=$installLocation \ + --api-dir=$dataDir/sip/PyQt5 \ --disable=QtOpenGL \ --disable=_QOpenGLFunctions_2_0 \ --disable=_QOpenGLFunctions_2_1 \ - --disable=_QOpenGLFunctions_4_1_Core \ - --verbose - - make $jobArgs - - cd ${sourceDir}_build3 - - # GENERIC: all python_setuptools-based installs need this - python=$packageLinksDir/$python3PackageName/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - $python configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$commandBinDir \ - --destdir=$installLocation \ - --sipdir=$dataDir/sip/PyQt5 \ - --sip=$portPackageLinksDir/cmd~sip/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - --no-dist-info \ - --disable=QtOpenGL \ - --disable=_QOpenGLFunctions_2_0 \ - --disable=_QOpenGLFunctions_2_1 \ - --disable=_QOpenGLFunctions_4_1_Core \ - #--verbose - + --disable=_QOpenGLFunctions_4_1_Core + cd build make $jobArgs } @@ -229,40 +171,22 @@ INSTALL() OLDPYTHONPATH=$PYTHONPATH local packageLinksDir=$(dirname $portPackageLinksDir) - local pythonPackageName="${portName}_python-$portFullVersion" - local python3PackageName="${portName}_python3-$portFullVersion" + local python3PackageName="${portName}_python38-$portFullVersion" - cd ${sourceDir}_build # GENERIC: all python_setuptools-based installs need this - python=$packageLinksDir/$pythonPackageName/cmd~python2/bin/python2 + python=$packageLinksDir/$python3PackageName/cmd~python$PYTHON3_VERSION/bin/python$PYTHON3_VERSION pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + installLocation=lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$OLDPYTHONPATH mkdir -p $installLocation - make install + cd build + make install INSTALL_ROOT="$prefix" + + $python -m compileall -d / $prefix/lib/python$pythonVersion + $python -O -m compileall -d / $prefix/lib/python$pythonVersion - for file in pylupdate5 pyrcc5 pyuic5; do - mv $commandBinDir/$file $commandBinDir/python2-$file - done - - packageEntries python \ - $installLocation \ - $commandBinDir/python2* - - rmdir $prefix/lib/python$pythonVersion - - cd ${sourceDir}_build3 - # GENERIC: all python_setuptools-based installs need this - python=$packageLinksDir/$python3PackageName/cmd~python$PYTHON3_VERSION/bin/python3 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$OLDPYTHONPATH - - mkdir -p $installLocation - make install - - packageEntries python3 \ + packageEntries python38 \ $installLocation \ $commandBinDir