From 57c374e31648ed9cd6b5906cf8e40c0e9b891bda Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 20 Feb 2017 18:34:36 +0100 Subject: [PATCH] pyqt: bump version, merge into one recipe. --- dev-python/pyqt/pyqt-5.7.1.recipe | 217 ++++++++++++++++++++++ dev-python/pyqt/python3_pyqt-5.5.1.recipe | 78 -------- dev-python/pyqt/python3_pyqt-5.6.recipe | 79 -------- dev-python/pyqt/python_pyqt-5.5.1.recipe | 78 -------- dev-python/pyqt/python_pyqt-5.6.recipe | 78 -------- 5 files changed, 217 insertions(+), 313 deletions(-) create mode 100644 dev-python/pyqt/pyqt-5.7.1.recipe delete mode 100644 dev-python/pyqt/python3_pyqt-5.5.1.recipe delete mode 100644 dev-python/pyqt/python3_pyqt-5.6.recipe delete mode 100644 dev-python/pyqt/python_pyqt-5.5.1.recipe delete mode 100644 dev-python/pyqt/python_pyqt-5.6.recipe diff --git a/dev-python/pyqt/pyqt-5.7.1.recipe b/dev-python/pyqt/pyqt-5.7.1.recipe new file mode 100644 index 000000000..b136236b8 --- /dev/null +++ b/dev-python/pyqt/pyqt-5.7.1.recipe @@ -0,0 +1,217 @@ +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 + python_setuptools + sip_python # >= 4.19 + python3_setuptools + 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/python3_pyqt-5.5.1.recipe b/dev-python/pyqt/python3_pyqt-5.5.1.recipe deleted file mode 100644 index 814f60140..000000000 --- a/dev-python/pyqt/python3_pyqt-5.5.1.recipe +++ /dev/null @@ -1,78 +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 Riverbank Computing Limited" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$portVersion/PyQt-gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386" -SOURCE_DIR="PyQt-gpl-$portVersion" - -ARCHITECTURES="x86 !x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - python3_pyqt${secondaryArchSuffix} = $portVersion - python3_dateutil${secondaryArchSuffix} - cmd:pylupdate5${secondaryArchSuffix} - cmd:pyrcc5${secondaryArchSuffix} - cmd:pyuic5${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libqt5${secondaryArchSuffix} - lib:libGL${secondaryArchSuffix} - python3_sip - cmd:python3 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - python3_setuptools - python3_sip - devel:libqt5${secondaryArchSuffix} - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python3 - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:qmake${secondaryArchSuffix} - " - -BUILD() -{ - # 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:$PYTHONPATH - - $portPackageLinksDir/cmd~python3/bin/python3 configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/python3_sip/bin/sip \ - #--verbose \ - #--sipdir= - - make $jobArgs -} - -INSTALL() -{ - # 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:$PYTHONPATH - - mkdir -p $installLocation - make install -} diff --git a/dev-python/pyqt/python3_pyqt-5.6.recipe b/dev-python/pyqt/python3_pyqt-5.6.recipe deleted file mode 100644 index 506882fc4..000000000 --- a/dev-python/pyqt/python3_pyqt-5.6.recipe +++ /dev/null @@ -1,79 +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="2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1" -SOURCE_DIR="PyQt5_gpl-$portVersion" - -ARCHITECTURES="x86 !x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - python3_pyqt${secondaryArchSuffix} = $portVersion - python3_dateutil${secondaryArchSuffix} - cmd:pylupdate5${secondaryArchSuffix} - cmd:pyrcc5${secondaryArchSuffix} - cmd:pyuic5${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - lib:libqt5${secondaryArchSuffix} - lib:libGL${secondaryArchSuffix} - python3_sip - cmd:python3 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - python3_setuptools - python3_sip - devel:libqt5${secondaryArchSuffix} - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python3 - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:qmake${secondaryArchSuffix} >= 5 - " - -BUILD() -{ - # 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:$PYTHONPATH - - $portPackageLinksDir/cmd~python3/bin/python3 configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/python3_sip/bin/sip \ - --stubsdir=$installLocation/PyQt5 \ - #--verbose \ - #--sipdir= - - make $jobArgs -} - -INSTALL() -{ - # 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:$PYTHONPATH - - mkdir -p $installLocation - make install -} diff --git a/dev-python/pyqt/python_pyqt-5.5.1.recipe b/dev-python/pyqt/python_pyqt-5.5.1.recipe deleted file mode 100644 index d004dccb1..000000000 --- a/dev-python/pyqt/python_pyqt-5.5.1.recipe +++ /dev/null @@ -1,78 +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 Riverbank Computing Limited" -LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$portVersion/PyQt-gpl-$portVersion.tar.gz" -CHECKSUM_SHA256="0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386" -SOURCE_DIR="PyQt-gpl-$portVersion" - -ARCHITECTURES="x86 !x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - python_pyqt${secondaryArchSuffix} = $portVersion - python_dateutil${secondaryArchSuffix} - cmd:pylupdate5${secondaryArchSuffix} - cmd:pyrcc5${secondaryArchSuffix} - cmd:pyuic5${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - python_sip - lib:libqt5${secondaryArchSuffix} - lib:libGL${secondaryArchSuffix} - cmd:python2 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - python_setuptools - python_sip - devel:libqt5${secondaryArchSuffix} - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:qmake${secondaryArchSuffix} - " - -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:$PYTHONPATH - - $portPackageLinksDir/cmd~python2/bin/python2 configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/python_sip/bin/sip \ - #--verbose \ - #--sipdir= - - make $jobArgs -} - -INSTALL() -{ - # 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:$PYTHONPATH - - mkdir -p $installLocation - make install -} diff --git a/dev-python/pyqt/python_pyqt-5.6.recipe b/dev-python/pyqt/python_pyqt-5.6.recipe deleted file mode 100644 index b9b7b2601..000000000 --- a/dev-python/pyqt/python_pyqt-5.6.recipe +++ /dev/null @@ -1,78 +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="2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1" -SOURCE_DIR="PyQt5_gpl-$portVersion" - -ARCHITECTURES="x86 !x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - python_pyqt${secondaryArchSuffix} = $portVersion - python_dateutil${secondaryArchSuffix} - cmd:pylupdate5${secondaryArchSuffix} - cmd:pyrcc5${secondaryArchSuffix} - cmd:pyuic5${secondaryArchSuffix} - " -REQUIRES=" - haiku${secondaryArchSuffix} - python_sip - lib:libqt5${secondaryArchSuffix} - lib:libGL${secondaryArchSuffix} - cmd:python2 - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - python_setuptools - python_sip - devel:libqt5${secondaryArchSuffix} - devel:libGL${secondaryArchSuffix} - " -BUILD_PREREQUIRES=" - cmd:python2 - cmd:gcc${secondaryArchSuffix} - cmd:make - cmd:ld${secondaryArchSuffix} - cmd:qmake${secondaryArchSuffix} >= 5 - " - -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:$PYTHONPATH - - $portPackageLinksDir/cmd~python2/bin/python2 configure.py \ - --confirm-license \ - --no-designer-plugin \ - --no-qml-plugin \ - --bindir=$binDir \ - --destdir=$installLocation \ - --sipdir=$dataDir \ - --sip=$portPackageLinksDir/python_sip/bin/sip \ - #--verbose \ - #--sipdir= - - make $jobArgs -} - -INSTALL() -{ - # 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:$PYTHONPATH - - mkdir -p $installLocation - make install -}