From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- dev-python/PyQt5/Manifest | 3 +- dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild | 200 +++++++++++++++++++++ dev-python/PyQt5/PyQt5-5.10.1.ebuild | 196 -------------------- .../PyQt5/files/PyQt5-5.10.1-fix-testlib.patch | 17 ++ 4 files changed, 219 insertions(+), 197 deletions(-) create mode 100644 dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild delete mode 100644 dev-python/PyQt5/PyQt5-5.10.1.ebuild create mode 100644 dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch (limited to 'dev-python/PyQt5') diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest index 4327f10ecd1d..559c4c567ef2 100644 --- a/dev-python/PyQt5/Manifest +++ b/dev-python/PyQt5/Manifest @@ -1,6 +1,7 @@ +AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc -EBUILD PyQt5-5.10.1.ebuild 5686 BLAKE2B ec3f132759d1e9f044916ddb9db882d5896418a3aa80602df7a92b206964bc21ecf9c9dbdf22f6f5f3703c07f842cb2d0e5cfbe2518d3acd30deb5ec0b3e4be4 SHA512 ef6dbca270d798236827c46e500347a2cb9cbb839eab09ba368a89b3cde1e2f130731df44290dac76bda286af3558c3fa81fb39217593f66468d058560693c86 +EBUILD PyQt5-5.10.1-r1.ebuild 5726 BLAKE2B 2e8b2944ba56cab72054067758828faa0bf56083dda75c01f57b3a4979697e2a87f4bc84ff1e8f0c57e4094dc88fab1854db47fd0f2b3907ebd8b2ef0ae34012 SHA512 c568f87ff49867f60dad75e0fdc3a07473c2d296dade0cc078080651f500266d3c744f5e8c1ed10ec04b708c10545805b772a48c991871ebea0fffa8689affef EBUILD PyQt5-5.9.2.ebuild 5687 BLAKE2B 42b0f29d9e9652571b29acfdc3ff90fe5bf1f4ff8776855df37faebb92c11c5e6c049fa10d4d8b6dcb323da379dba0a8bbf231f6751a3be715b7384847d2730c SHA512 d71ebc7f8f90b4e80566a31b8eca0a291f51aeef5cc66f8c860581e69ca70131339606f917e9a1f0e99beb5132796721bc9033667c977ca4a92023be5c5bca8c MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8 diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild new file mode 100644 index 000000000000..cd3cbfc99ae9 --- /dev/null +++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild @@ -0,0 +1,200 @@ +# 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 ~ppc ~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.4: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} ) + +PATCHES=( + "${FILESDIR}/${P}-timeline.patch" + "${FILESDIR}/${P}-fix-testlib.patch" +) + +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.10.1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1.ebuild deleted file mode 100644 index c1ab53f42bf1..000000000000 --- a/dev-python/PyQt5/PyQt5-5.10.1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# 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 ~ppc ~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} ) -PATCHES=( "${FILESDIR}/${P}-timeline.patch" ) - -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/files/PyQt5-5.10.1-fix-testlib.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch new file mode 100644 index 000000000000..38a20bc36d12 --- /dev/null +++ b/dev-python/PyQt5/files/PyQt5-5.10.1-fix-testlib.patch @@ -0,0 +1,17 @@ +From: Fabian Vogt +Subject: QTest::waitForEvents() is internal only + +Must not be used, got removed with Qt 5.11. + +Index: PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip +=================================================================== +--- a/sip/QtTest/qtestmouse.sip ++++ b/sip/QtTest/qtestmouse.sip +@@ -41,7 +41,6 @@ namespace QTest + void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); + void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); + void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); +- void waitForEvents() /ReleaseGIL/; + void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); + void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); + void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); -- cgit v1.2.3