From eaab68ba6a05bc57d98ca12032440835ef905326 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Feb 2018 08:30:30 +0000 Subject: gentoo resync : 03.02.2018 --- dev-python/PyQt5/Manifest | 6 +- dev-python/PyQt5/PyQt5-5.10.ebuild | 195 +++++++++++++++++++++++++++++++++++ dev-python/PyQt5/PyQt5-5.9.1.ebuild | 198 ------------------------------------ dev-python/PyQt5/PyQt5-5.9.2.ebuild | 6 +- 4 files changed, 201 insertions(+), 204 deletions(-) create mode 100644 dev-python/PyQt5/PyQt5-5.10.ebuild delete mode 100644 dev-python/PyQt5/PyQt5-5.9.1.ebuild (limited to 'dev-python/PyQt5') diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest index b0bdf0c58f0a..3f2e78d5858d 100644 --- a/dev-python/PyQt5/Manifest +++ b/dev-python/PyQt5/Manifest @@ -1,7 +1,7 @@ +DIST PyQt5_gpl-5.10.tar.gz 3109934 BLAKE2B 96553b9a6f93c9ff86dc574e44f989d1aa371a5bf28cf3023ebcc9526791d28deab47e6f76ba70b46d33d80fc00d0b4df47cd4bb53a649dc98b8d0c0425d6742 SHA512 a86520870536618857ed3ee1601af45f5a0b456de192a5d6a3f8fa734e5cf49b8ce373928c0f4aeaae365d3fa95db03b5f59ae2903bc5eb2304b7edf22198033 DIST PyQt5_gpl-5.7.1.tar.gz 3733746 BLAKE2B de8aea058876d740f391901434fa2c7ca1760b323b555efb48b06f8ba3213baccec676bc3984832e0775b28f0d2b2ddf0c37fa35317c237ed9af2e20469ff9ae SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f -DIST PyQt5_gpl-5.9.1.tar.gz 3101819 BLAKE2B b457a101ad285e65cd246a7f77cc2d8a53b4b948d1b22405abf7f3a4ea7a0ab10335b310f1731c6660937fa18647fc00858b781f32d44dd85d1452d2eca821cf SHA512 1c7d00dac5329296dd205eddeeecfd29495c4746791730056d143438871eb64a5d9827dcb1e28a78e8746218908e0e72374bd686a21b631b9aa1aa1c67e61eac DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc +EBUILD PyQt5-5.10.ebuild 5635 BLAKE2B 4355cdeca43a532252f7746dc1a6636bc9465e20d294acf27596057678f69da09caf40b683e1a841a4d85c6ba3c14c59155f0f86bdcc0fb84044245f6e96a6ad SHA512 2375e07b1fc8c1cd08bc40199f892b01f943ce92d14ecac0576dfabf8e630f59f57dba2c66dae02341dd57428f4e592fd8d6032ece3f2a888ad4eebb84177d52 EBUILD PyQt5-5.7.1.ebuild 5547 BLAKE2B 29e51fddc17c2cb03213d244f929165cc95d71b870fe121efed70166f0aeef5a6fd6d2ea9803c0038cfd37363e5abf9de66e0ac89d8e186a9c3fdad988809188 SHA512 187e6664388e61b62066e95797d0a467b30941441ff83872fbeed16abfdbacf5d4bf5ecc575f93ca83fa09e3be16af993d358bf99f3c16f76610aaceb27b1900 -EBUILD PyQt5-5.9.1.ebuild 5691 BLAKE2B 8b4080281785a58259b7e60a780a413d38bb9ff60fbdbefbca1715e3d43e27a6080359dcc3c7436d71c3f7dfb6ba28c99e386c72c9ff01b9f102e4274853931a SHA512 19633d4a855751e67fe8280f4e4c2364b6de9d9e4237cf77938f2714ac0efab3010f6d05972e21e7f31ac5d7958693f03eb2981dd7210fbbeb76cfa99aeeeba3 -EBUILD PyQt5-5.9.2.ebuild 5687 BLAKE2B 7eb3914f4d30e6052af40100dd1ee4160538e07758be41db9fd239274c8262bf1346a5b7507cd77fcc2a6d7070d69764b23cb4dbd505a9d0b075179d0a4867d7 SHA512 fe923e982eac291fc999088cddd64612ecb918bf02ba8ae686e1a91db88e86161f782a78797eb9028190195a42b95a04b669fba1d0d5a3592ac0ec7425778c5c +EBUILD PyQt5-5.9.2.ebuild 5684 BLAKE2B 112240ab66ced96c8dc49a1df6df80ee9833297db2a23e22e197acb78e034ee0e6ed45ecfeae136787ee0ca808bd977eae315c37ad1bb0bf54375be2dd4c28f4 SHA512 3df5af3b273a243b23d883a6ef8541551d1195f8ae035c2bba578154488fc0301b8bdf54ea144936841a32cde92dd0319d6b36b64a08614b287c6fe6ffc85d90 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8 diff --git a/dev-python/PyQt5/PyQt5-5.10.ebuild b/dev-python/PyQt5/PyQt5-5.10.ebuild new file mode 100644 index 000000000000..809e464ee4b5 --- /dev/null +++ b/dev-python/PyQt5/PyQt5-5.10.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit multibuild python-r1 qmake-utils + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro" + +MY_P=${PN}_gpl-${PV/_pre/.dev} +if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz" +else + SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" +fi + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +# TODO: QtNetworkAuth, QtNfc +IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location + multimedia network opengl positioning printsupport sensors serialport sql svg + testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns" + +# The requirements below were extracted from configure.py +# and from the output of 'grep -r "%Import " "${S}"/sip' +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bluetooth? ( gui ) + declarative? ( gui network ) + designer? ( widgets ) + help? ( gui widgets ) + location? ( positioning ) + multimedia? ( gui network ) + opengl? ( gui widgets ) + positioning? ( gui ) + printsupport? ( gui widgets ) + sensors? ( gui ) + serialport? ( gui ) + sql? ( widgets ) + svg? ( gui widgets ) + testlib? ( widgets ) + webchannel? ( network ) + webengine? ( network widgets? ( printsupport webchannel ) ) + webkit? ( gui network printsupport widgets ) + websockets? ( network ) + widgets? ( gui ) + xmlpatterns? ( network ) +" + +# Minimal supported version of Qt. +QT_PV="5.9.3:5" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-python/sip-4.19.6:=[${PYTHON_USEDEP}] + >=dev-qt/qtcore-${QT_PV} + >=dev-qt/qtxml-${QT_PV} + bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} ) + dbus? ( + dev-python/dbus-python[${PYTHON_USEDEP}] + >=dev-qt/qtdbus-${QT_PV} + ) + declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + designer? ( >=dev-qt/designer-${QT_PV} ) + gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] ) + help? ( >=dev-qt/qthelp-${QT_PV} ) + location? ( >=dev-qt/qtlocation-${QT_PV} ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] ) + network? ( >=dev-qt/qtnetwork-${QT_PV} ) + opengl? ( >=dev-qt/qtopengl-${QT_PV} ) + positioning? ( >=dev-qt/qtpositioning-${QT_PV} ) + printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} ) + sensors? ( >=dev-qt/qtsensors-${QT_PV} ) + serialport? ( >=dev-qt/qtserialport-${QT_PV} ) + sql? ( >=dev-qt/qtsql-${QT_PV} ) + svg? ( >=dev-qt/qtsvg-${QT_PV} ) + testlib? ( >=dev-qt/qttest-${QT_PV} ) + webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} ) + webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) + webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] ) + websockets? ( >=dev-qt/qtwebsockets-${QT_PV} ) + widgets? ( >=dev-qt/qtwidgets-${QT_PV} ) + x11extras? ( >=dev-qt/qtx11extras-${QT_PV} ) + xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} ) +" +DEPEND="${RDEPEND} + dbus? ( virtual/pkgconfig ) +" + +S=${WORKDIR}/${MY_P} + +DOCS=( "${S}"/{ChangeLog,NEWS} ) + +pyqt_use_enable() { + use "$1" || return + + if [[ $# -eq 1 ]]; then + echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1} + else + shift + echo ${@/#/--enable=} + fi +} + +src_configure() { + configuration() { + local myconf=( + "${PYTHON}" + "${S}"/configure.py + $(usex debug '--debug --qml-debug --trace' '') + --verbose + --confirm-license + --qmake="$(qt5_get_bindir)"/qmake + --bindir="${EPREFIX}/usr/bin" + --destdir="$(python_get_sitedir)" + --sip-incdir="$(python_get_includedir)" + --qsci-api + --enable=QtCore + --enable=QtXml + $(pyqt_use_enable bluetooth) + $(pyqt_use_enable dbus QtDBus) + $(usex dbus '' --no-python-dbus) + $(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets '')) + $(usex declarative '' --no-qml-plugin) + $(pyqt_use_enable designer) + $(usex designer '' --no-designer-plugin) + $(pyqt_use_enable gui) + $(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core})) + $(pyqt_use_enable help) + $(pyqt_use_enable location) + $(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets '')) + $(pyqt_use_enable network) + $(pyqt_use_enable opengl QtOpenGL) + $(pyqt_use_enable positioning) + $(pyqt_use_enable printsupport QtPrintSupport) + $(pyqt_use_enable sensors) + $(pyqt_use_enable serialport QtSerialPort) + $(pyqt_use_enable sql) + $(pyqt_use_enable svg) + $(pyqt_use_enable testlib QtTest) + $(pyqt_use_enable webchannel QtWebChannel) + $(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets '')) + $(pyqt_use_enable webkit QtWebKit QtWebKitWidgets) + $(pyqt_use_enable websockets QtWebSockets) + $(pyqt_use_enable widgets) + $(pyqt_use_enable x11extras QtX11Extras) + $(pyqt_use_enable xmlpatterns QtXmlPatterns) + ) + echo "${myconf[@]}" + "${myconf[@]}" || die + + eqmake5 -recursive ${PN}.pro + } + python_foreach_impl run_in_build_dir configuration +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_install() { + installation() { + local tmp_root=${D%/}/tmp + emake INSTALL_ROOT="${tmp_root}" install + + local bin_dir=${tmp_root}${EPREFIX}/usr/bin + local exe + for exe in pylupdate5 pyrcc5 pyuic5; do + python_doexe "${bin_dir}/${exe}" + rm "${bin_dir}/${exe}" || die + done + + local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic + if python_is_python3; then + rm -r "${uic_dir}"/port_v2 || die + else + rm -r "${uic_dir}"/port_v3 || die + fi + + multibuild_merge_root "${tmp_root}" "${D}" + python_optimize + } + python_foreach_impl run_in_build_dir installation + + einstalldocs + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + fi +} diff --git a/dev-python/PyQt5/PyQt5-5.9.1.ebuild b/dev-python/PyQt5/PyQt5-5.9.1.ebuild deleted file mode 100644 index fa923f28b100..000000000000 --- a/dev-python/PyQt5/PyQt5-5.9.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit multibuild python-r1 qmake-utils - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro" - -MY_P=${PN}_gpl-${PV/_pre/.dev} -if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz" -else - SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" -fi - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -# TODO: QtNfc -IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location - multimedia network opengl positioning printsupport sensors serialport sql svg - testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns" - -# The requirements below were extracted from configure.py -# and from the output of 'grep -r "%Import " "${S}"/sip' -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - bluetooth? ( gui ) - declarative? ( gui network ) - designer? ( widgets ) - help? ( gui widgets ) - location? ( positioning ) - multimedia? ( gui network ) - opengl? ( gui widgets ) - positioning? ( gui ) - printsupport? ( gui widgets ) - sensors? ( gui ) - serialport? ( gui ) - sql? ( widgets ) - svg? ( gui widgets ) - testlib? ( widgets ) - webchannel? ( network ) - webengine? ( network widgets? ( printsupport webchannel ) ) - webkit? ( gui network printsupport widgets ) - websockets? ( network ) - widgets? ( gui ) - xmlpatterns? ( network ) -" - -# Minimal supported version of Qt. -QT_PV="5.6.0:5" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-python/sip-4.19.6_pre:=[${PYTHON_USEDEP}] - >=dev-qt/qtcore-${QT_PV} - >=dev-qt/qtxml-${QT_PV} - bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} ) - dbus? ( - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-qt/qtdbus-${QT_PV} - ) - declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - designer? ( >=dev-qt/designer-${QT_PV} ) - gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] ) - help? ( >=dev-qt/qthelp-${QT_PV} ) - location? ( >=dev-qt/qtlocation-${QT_PV} ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] ) - network? ( >=dev-qt/qtnetwork-${QT_PV} ) - opengl? ( >=dev-qt/qtopengl-${QT_PV} ) - positioning? ( >=dev-qt/qtpositioning-${QT_PV} ) - printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} ) - sensors? ( >=dev-qt/qtsensors-${QT_PV} ) - serialport? ( >=dev-qt/qtserialport-${QT_PV} ) - sql? ( >=dev-qt/qtsql-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - testlib? ( >=dev-qt/qttest-${QT_PV} ) - webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} ) - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) - webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] ) - websockets? ( >=dev-qt/qtwebsockets-${QT_PV} ) - widgets? ( >=dev-qt/qtwidgets-${QT_PV} ) - x11extras? ( >=dev-qt/qtx11extras-${QT_PV} ) - xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} ) -" -DEPEND="${RDEPEND} - dbus? ( virtual/pkgconfig ) -" - -S=${WORKDIR}/${MY_P} - -DOCS=( "${S}"/{ChangeLog,NEWS} ) - -pyqt_use_enable() { - use "$1" || return - - if [[ $# -eq 1 ]]; then - echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1} - else - shift - echo ${@/#/--enable=} - fi -} - -src_configure() { - configuration() { - # Fix out-of-source build - ln -s "${S}"/config-tests || die - - local myconf=( - "${PYTHON}" - "${S}"/configure.py - $(usex debug '--debug --qml-debug --trace' '') - --verbose - --confirm-license - --qmake="$(qt5_get_bindir)"/qmake - --bindir="${EPREFIX}/usr/bin" - --destdir="$(python_get_sitedir)" - --sip-incdir="$(python_get_includedir)" - --qsci-api - --enable=QtCore - --enable=QtXml - $(pyqt_use_enable bluetooth) - $(pyqt_use_enable dbus QtDBus) - $(usex dbus '' --no-python-dbus) - $(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets '')) - $(usex declarative '' --no-qml-plugin) - $(pyqt_use_enable designer) - $(usex designer '' --no-designer-plugin) - $(pyqt_use_enable gui) - $(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core})) - $(pyqt_use_enable help) - $(pyqt_use_enable location) - $(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets '')) - $(pyqt_use_enable network) - $(pyqt_use_enable opengl QtOpenGL) - $(pyqt_use_enable positioning) - $(pyqt_use_enable printsupport QtPrintSupport) - $(pyqt_use_enable sensors) - $(pyqt_use_enable serialport QtSerialPort) - $(pyqt_use_enable sql) - $(pyqt_use_enable svg) - $(pyqt_use_enable testlib QtTest) - $(pyqt_use_enable webchannel QtWebChannel) - $(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets '')) - $(pyqt_use_enable webkit QtWebKit QtWebKitWidgets) - $(pyqt_use_enable websockets QtWebSockets) - $(pyqt_use_enable widgets) - $(pyqt_use_enable x11extras QtX11Extras) - $(pyqt_use_enable xmlpatterns QtXmlPatterns) - ) - echo "${myconf[@]}" - "${myconf[@]}" || die - - eqmake5 -recursive ${PN}.pro - } - python_foreach_impl run_in_build_dir configuration -} - -src_compile() { - python_foreach_impl run_in_build_dir default -} - -src_install() { - installation() { - local tmp_root=${D%/}/tmp - emake INSTALL_ROOT="${tmp_root}" install - - local bin_dir=${tmp_root}${EPREFIX}/usr/bin - local exe - for exe in pylupdate5 pyrcc5 pyuic5; do - python_doexe "${bin_dir}/${exe}" - rm "${bin_dir}/${exe}" || die - done - - local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic - if python_is_python3; then - rm -r "${uic_dir}"/port_v2 || die - else - rm -r "${uic_dir}"/port_v3 || die - fi - - multibuild_merge_root "${tmp_root}" "${D}" - python_optimize - } - python_foreach_impl run_in_build_dir installation - - einstalldocs - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild index da916939bf1e..e465a1c6492b 100644 --- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild +++ b/dev-python/PyQt5/PyQt5-5.9.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,7 +52,7 @@ REQUIRED_USE=" " # Minimal supported version of Qt. -QT_PV="5.7.1:5" +QT_PV="5.9.3:5" RDEPEND=" ${PYTHON_DEPS} @@ -81,7 +81,7 @@ RDEPEND=" testlib? ( >=dev-qt/qttest-${QT_PV} ) webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} ) webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) - webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] ) + webkit? ( >=dev-qt/qtwebkit-5.9:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-${QT_PV} ) widgets? ( >=dev-qt/qtwidgets-${QT_PV} ) x11extras? ( >=dev-qt/qtx11extras-${QT_PV} ) -- cgit v1.2.3