From db5e1f5f3c7e59e8ac53eb01e1ed997e8026a736 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [feature/flatten]" Date: Wed, 14 Oct 2020 18:39:02 +0000 Subject: Updating liguros repo --- dev-python/cbor2/Manifest | 1 + dev-python/cbor2/cbor2-5.2.0.ebuild | 39 ++++ dev-python/pypugjs/Manifest | 1 + dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild | 1 + dev-python/pypugjs/pypugjs-5.9.5.ebuild | 23 +++ dev-python/pyside2/Manifest | 2 +- dev-python/pyside2/pyside2-5.14.2.ebuild | 209 -------------------- dev-python/pyside2/pyside2-5.15.1.ebuild | 211 +++++++++++++++++++++ .../pytest-pylint/pytest-pylint-0.17.0.ebuild | 2 +- dev-python/routes/routes-2.5.1.ebuild | 5 +- dev-python/ryu/Manifest | 1 + dev-python/ryu/ryu-4.34.ebuild | 24 +++ dev-python/shiboken2/Manifest | 2 +- dev-python/shiboken2/shiboken2-5.14.2.ebuild | 169 ----------------- dev-python/shiboken2/shiboken2-5.15.1.ebuild | 169 +++++++++++++++++ 15 files changed, 477 insertions(+), 382 deletions(-) create mode 100644 dev-python/cbor2/cbor2-5.2.0.ebuild create mode 100644 dev-python/pypugjs/pypugjs-5.9.5.ebuild delete mode 100644 dev-python/pyside2/pyside2-5.14.2.ebuild create mode 100644 dev-python/pyside2/pyside2-5.15.1.ebuild create mode 100644 dev-python/ryu/ryu-4.34.ebuild delete mode 100644 dev-python/shiboken2/shiboken2-5.14.2.ebuild create mode 100644 dev-python/shiboken2/shiboken2-5.15.1.ebuild (limited to 'dev-python') diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest index a67b6c404d8f..b8de5259b911 100644 --- a/dev-python/cbor2/Manifest +++ b/dev-python/cbor2/Manifest @@ -1 +1,2 @@ DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941dbde65acabe7f7a3bfde37ab0322085a3107fb581e36cb6792cfb4fcf07cdbedfcec4a18a907582081d141 SHA512 81e4c3e8c727fea6db8bbed657806ace8777d8ad157395de3db7f0dab369abcd7f173f0cfad538c325a49bf90b450eab16ad2f4aa4f69c324dd0807ae0ab556f +DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4 diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild new file mode 100644 index 000000000000..ecd0b679f8e9 --- /dev/null +++ b/dev-python/cbor2/cbor2-5.2.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS="bdepend" + +inherit distutils-r1 + +DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support" +HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +BDEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + ) +" + +RDEPEND="${DEPEND}" + +python_prepare_all() { + + # remove pytest-cov dep + sed -e "s/pytest-cov//" \ + -e "s/--cov //" \ + -i setup.cfg || die + + distutils-r1_python_prepare_all +} + +distutils_enable_tests pytest diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest index 2608905a6a19..028000973669 100644 --- a/dev-python/pypugjs/Manifest +++ b/dev-python/pypugjs/Manifest @@ -1 +1,2 @@ DIST pypugjs-5.9.4.tar.gz 42179 BLAKE2B 6ba3ab0b5c4c2828a091c82d5e937ebd1f575f5a9ebd989fbcfa3c17b85471f084d04b641895e8bd4af32ca0c26c430c5d989287824e0bc67f1943fae3bb0caa SHA512 24ebf306a76afab570cb13806d27e12766163bb114a8e4fe20ee5f19eb7311203e8b647eeb2f150efb2f9dfa1db9e56f4218cc3deb15d81f22b12d1b11f83c32 +DIST pypugjs-5.9.5.tar.gz 48925 BLAKE2B 4487799759e5090a9ef20da5af2d94d6f2d0139409cb5b963153ca949160bdf3f8f5ec8a3dd2949913b80f77b454ce4aeca00d9df10716c7202e105823db8f8b SHA512 f38ced5a908a4353aa1e48df605ebd80da418ecd2f5f554bf8e7788275a13ed82bc5b420656e5ba88862e033e339c5118d097d0ca7c1237aadd5049a15976aa8 diff --git a/dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild b/dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild index 1c3f4e22bd1c..1a4dc64cbab5 100644 --- a/dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild +++ b/dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS="bdepend" inherit distutils-r1 diff --git a/dev-python/pypugjs/pypugjs-5.9.5.ebuild b/dev-python/pypugjs/pypugjs-5.9.5.ebuild new file mode 100644 index 000000000000..1a4dc64cbab5 --- /dev/null +++ b/dev-python/pypugjs/pypugjs-5.9.5.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS="bdepend" + +inherit distutils-r1 + +DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates" +HOMEPAGE="https://github.com/kakulukia/pypugjs" +SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="" +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/chardet +" +DEPEND="${RDEPEND}" diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest index facc7cac9c94..0d5e684462d4 100644 --- a/dev-python/pyside2/Manifest +++ b/dev-python/pyside2/Manifest @@ -1 +1 @@ -DIST pyside-setup-opensource-src-5.14.2.tar.xz 3238036 BLAKE2B 454f19ae4e154747bad2b833727ab62ded15bbac495cc0bef112ce6cccdd69bb5bb541c9b31125bd05090bfce042bac2ac8b47690c695e82b5c901e45e87f681 SHA512 6708c4ebb115119796756ccac89197e111eb27c4a91f52875da04eff4ca6f9e3fffefc18cc0219a8c3a3c81a667bf7509909a6d1d9ff1ee2cc0d957453cceffa +DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306 diff --git a/dev-python/pyside2/pyside2-5.14.2.ebuild b/dev-python/pyside2/pyside2-5.14.2.ebuild deleted file mode 100644 index 4bb23b3e2c92..000000000000 --- a/dev-python/pyside2/pyside2-5.14.2.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) - -inherit cmake python-r1 virtualx - -# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" -# USE flag after an external "dev-qt/qtremoteobjects" package has been created. -# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. -# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once -# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. -# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note -# that the "PySide2/QtGui/CMakeLists.txt" and -# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by -# testing whether the "Qt5::Gui" list property defined by -# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation -# time contains the substring "opengles2". Since cmake does not permit -# properties to be overridden from the command line, these files must instead -# be conditionally patched to avoid these tests. An issue should be filed with -# upstream requesting a CLI-settable variable to control this. - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" - -# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details. -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - 3d charts concurrent datavis designer gles2-only +gui help location - multimedia +network positioning printsupport qml quick script scripttools - scxml sensors speech sql svg test testlib webchannel webengine websockets - +widgets x11extras xml xmlpatterns -" - -# Manually reextract these requirements on version bumps by running the -# following one-liner from within "${S}": -# $ grep 'set\(.*_deps' PySide2/Qt*/CMakeLists.txt -# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - 3d? ( gui network ) - charts? ( widgets ) - datavis? ( gui ) - designer? ( widgets xml ) - gles2-only? ( gui ) - help? ( widgets ) - location? ( positioning ) - multimedia? ( gui network ) - printsupport? ( widgets ) - qml? ( gui network ) - quick? ( qml ) - scripttools? ( gui script widgets ) - speech? ( multimedia ) - sql? ( widgets ) - svg? ( widgets ) - testlib? ( widgets ) - webengine? ( - location quick - widgets? ( gui network printsupport webchannel ) - ) - websockets? ( network ) - widgets? ( gui ) - x11extras? ( gui ) -" - -#tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-2):5" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}] - dev-qt/qtcore:5= - 3d? ( >=dev-qt/qt3d-${QT_PV}[qml?] ) - charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] ) - concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} ) - datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?] ) - designer? ( >=dev-qt/designer-${QT_PV} ) - gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only?] ) - help? ( >=dev-qt/qthelp-${QT_PV} ) - location? ( >=dev-qt/qtlocation-${QT_PV} ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml?,widgets?] ) - network? ( >=dev-qt/qtnetwork-${QT_PV} ) - positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] ) - printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} ) - qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - script? ( >=dev-qt/qtscript-${QT_PV} ) - scxml? ( >=dev-qt/qtscxml-${QT_PV} ) - sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] ) - speech? ( >=dev-qt/qtspeech-${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}[qml?] ) - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) - websockets? ( >=dev-qt/qtwebsockets-${QT_PV}[qml?] ) - widgets? ( >=dev-qt/qtwidgets-${QT_PV} ) - x11extras? ( >=dev-qt/qtx11extras-${QT_PV} ) - xml? ( >=dev-qt/qtxml-${QT_PV} ) - xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV}[qml?] ) -" -DEPEND="${RDEPEND} - test? ( x11-misc/xvfb-run ) -" - -S=${WORKDIR}/${MY_P}/sources/pyside2 - -src_configure() { - # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns) - ) - - pyside2_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" - -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" - ) - cmake_src_configure - } - python_foreach_impl pyside2_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE - python_foreach_impl virtx cmake_src_test -} - -src_install() { - pyside2_install() { - cmake_src_install - python_optimize - - # Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig - # file for the current Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \ - "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die - - # Uniquify the PySide2 pkgconfig file for the current Python target, - # preserving an unversioned "pyside2.pc" file arbitrarily associated - # with the last Python target. (See the previously linked issue.) - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl pyside2_install - - # CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., pyside2-tools) to target one - # "libpyside2-*.so" library linked to one Python interpreter. See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-gentoo.cmake" || die -} diff --git a/dev-python/pyside2/pyside2-5.15.1.ebuild b/dev-python/pyside2/pyside2-5.15.1.ebuild new file mode 100644 index 000000000000..930c172ad5e0 --- /dev/null +++ b/dev-python/pyside2/pyside2-5.15.1.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) + +inherit cmake python-r1 virtualx + +# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" +# USE flag after an external "dev-qt/qtremoteobjects" package has been created. +# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. +# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once +# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. +# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note +# that the "PySide2/QtGui/CMakeLists.txt" and +# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by +# testing whether the "Qt5::Gui" list property defined by +# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation +# time contains the substring "opengles2". Since cmake does not permit +# properties to be overridden from the command line, these files must instead +# be conditionally patched to avoid these tests. An issue should be filed with +# upstream requesting a CLI-settable variable to control this. + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://wiki.qt.io/PySide2" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" + +# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details. +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE=" + 3d charts concurrent datavis designer gles2-only +gui help location + multimedia +network positioning printsupport qml quick script scripttools + scxml sensors speech sql svg test testlib webchannel webengine websockets + +widgets x11extras xml xmlpatterns +" + +# Manually reextract these requirements on version bumps by running the +# following one-liner from within "${S}": +# $ grep 'set\(.*_deps' PySide2/Qt*/CMakeLists.txt +# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + 3d? ( gui network ) + charts? ( widgets ) + datavis? ( gui ) + designer? ( widgets xml ) + gles2-only? ( gui ) + help? ( widgets ) + location? ( positioning ) + multimedia? ( gui network ) + printsupport? ( widgets ) + qml? ( gui network ) + quick? ( qml ) + scripttools? ( gui script widgets ) + speech? ( multimedia ) + sql? ( widgets ) + svg? ( widgets ) + testlib? ( widgets ) + webengine? ( + location quick + widgets? ( gui network printsupport webchannel ) + ) + websockets? ( network ) + widgets? ( gui ) + x11extras? ( gui ) +" + +#tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2):5" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}] + dev-qt/qtcore:5= + dev-qt/qtopengl:5= + dev-qt/qtserialport:5= + 3d? ( >=dev-qt/qt3d-${QT_PV}[qml?] ) + charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] ) + concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} ) + datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?] ) + designer? ( >=dev-qt/designer-${QT_PV} ) + gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only?] ) + help? ( >=dev-qt/qthelp-${QT_PV} ) + location? ( >=dev-qt/qtlocation-${QT_PV} ) + multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml?,widgets?] ) + network? ( >=dev-qt/qtnetwork-${QT_PV} ) + positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] ) + printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} ) + qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + script? ( >=dev-qt/qtscript-${QT_PV} ) + scxml? ( >=dev-qt/qtscxml-${QT_PV} ) + sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] ) + speech? ( >=dev-qt/qtspeech-${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}[qml?] ) + webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) + websockets? ( >=dev-qt/qtwebsockets-${QT_PV}[qml?] ) + widgets? ( >=dev-qt/qtwidgets-${QT_PV} ) + x11extras? ( >=dev-qt/qtx11extras-${QT_PV} ) + xml? ( >=dev-qt/qtxml-${QT_PV} ) + xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV}[qml?] ) +" +DEPEND="${RDEPEND} + test? ( x11-misc/xvfb-run ) +" + +S=${WORKDIR}/${MY_P}/sources/pyside2 + +src_configure() { + # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns) + ) + + pyside2_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" + -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" + ) + cmake_src_configure + } + python_foreach_impl pyside2_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside2_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide2 pkgconfig file for the current Python target, + # preserving an unversioned "pyside2.pc" file arbitrarily associated + # with the last Python target. (See the previously linked issue.) + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl pyside2_install + + # CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside2-tools) to target one + # "libpyside2-*.so" library linked to one Python interpreter. See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-gentoo.cmake" || die +} diff --git a/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild index ed019579b939..120b1bd69251 100644 --- a/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild +++ b/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="pytest plugin to check source code with pylint" HOMEPAGE="https://github.com/carsongee/pytest-pylint" # Tests should be included in PyPI tarballs by the next release: # https://github.com/carsongee/pytest-pylint/commit/4e7f06701ca06697a22a029db9857fa2fdf7c033 -SRC_URI="https://github.com/carsongee/pytest-pylint/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/carsongee/pytest-pylint/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/dev-python/routes/routes-2.5.1.ebuild b/dev-python/routes/routes-2.5.1.ebuild index cd6c1cec07aa..5c8cf3cece91 100644 --- a/dev-python/routes/routes-2.5.1.ebuild +++ b/dev-python/routes/routes-2.5.1.ebuild @@ -25,7 +25,10 @@ RDEPEND=" " BDEPEND=" - test? ( dev-python/webob[${PYTHON_USEDEP}] )" + test? ( + dev-python/webob[${PYTHON_USEDEP}] + dev-python/webtest[${PYTHON_USEDEP}] + )" distutils_enable_tests nose distutils_enable_sphinx doc diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest index b20397bb76a0..1855346f4956 100644 --- a/dev-python/ryu/Manifest +++ b/dev-python/ryu/Manifest @@ -1 +1,2 @@ DIST ryu-4.26.tar.gz 1518130 BLAKE2B bc6c03ad746b5b20f53c1b5ab8d9637efcdf92dec83eb2ea105898125b4887fdf03c478122b3d33ad099da4be8d51368c24875cfe0aa1aca58ca5b3f26255adc SHA512 a88c98904945270b8465b8daaa96c57e067e0091f7b300086f2ab8b07a7c024963382fc73c018fd15eac6c25a565125107e3ef4e79c2a5b49cf297c74511a260 +DIST ryu-4.34.tar.gz 1100203 BLAKE2B fd8f133ffe3b13781664b5da871419e76b6b869bcd35991e7231c61af91c7c76201679bf5a449660d2cc5841d77303d1b6e65271f27977a6ba8954e41c9b8ea1 SHA512 6841bb9325366c2558b11854a5f4e922cdf8a16723c1c48a7cc6fb4d0848e00686086eaecb9cef1e53686553d2ed689fd1d8da84882b60eefb95cb1ad21eead9 diff --git a/dev-python/ryu/ryu-4.34.ebuild b/dev-python/ryu/ryu-4.34.ebuild new file mode 100644 index 000000000000..4e5a539388e8 --- /dev/null +++ b/dev-python/ryu/ryu-4.34.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Component-based Software-defined Networking Framework" +HOMEPAGE="https://ryu-sdn.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND="dev-python/pbr[${PYTHON_USEDEP}]" + +python_install_all() { + distutils-r1_python_install_all + mv "${D}"/usr/etc "${D}"/etc +} diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index facc7cac9c94..0d5e684462d4 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -1 +1 @@ -DIST pyside-setup-opensource-src-5.14.2.tar.xz 3238036 BLAKE2B 454f19ae4e154747bad2b833727ab62ded15bbac495cc0bef112ce6cccdd69bb5bb541c9b31125bd05090bfce042bac2ac8b47690c695e82b5c901e45e87f681 SHA512 6708c4ebb115119796756ccac89197e111eb27c4a91f52875da04eff4ca6f9e3fffefc18cc0219a8c3a3c81a667bf7509909a6d1d9ff1ee2cc0d957453cceffa +DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306 diff --git a/dev-python/shiboken2/shiboken2-5.14.2.ebuild b/dev-python/shiboken2/shiboken2-5.14.2.ebuild deleted file mode 100644 index 8f404047936e..000000000000 --- a/dev-python/shiboken2/shiboken2-5.14.2.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# TODO: Split the "/usr/bin/shiboken2" binding generator from the -# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former -# requires everything (including Clang) at runtime; the latter only requires -# Qt and Python at runtime. Note that "pip" separates these two as well. See: -# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding -# Once split, the PySide2 ebuild should be revised to require -# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{5,6,7,8,9} ) - -inherit cmake-utils llvm python-r1 toolchain-funcs - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python binding generator for C++ libraries" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" - -# The "sources/shiboken2/libshiboken" directory is triple-licensed under the -# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 -# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be -# arbitrarily relicensed. (TODO) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+docstrings numpy test vulkan" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -#tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-2):5" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -RDEPEND="${PYTHON_DEPS} - >=dev-qt/qtcore-${QT_PV} - >=sys-devel/clang-6:= - docstrings? ( - >=dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - >=dev-qt/qtxml-${QT_PV} - >=dev-qt/qtxmlpatterns-${QT_PV} - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qttest-${QT_PV} ) -" - -S=${WORKDIR}/${MY_P}/sources/shiboken2 -DOCS=( AUTHORS ) - -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - # TODO: File upstream issue requesting a sane way to disable NumPy support. - if ! use numpy; then - sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die - fi - - # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" - # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". - if use vulkan; then - sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - fi - - # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" - # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the - # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is - # the largest version specifier that exists under the "/usr/lib/clang/" - # subdirectory. This assumption is false in edge cases, including when - # users downgrade from newer Clang versions but fail to remove those - # versions with "emerge --depclean". See also: - # https://github.com/leycec/raiagent/issues/85 - # - # Sadly, the clang-* family of functions exported by the "toolchain-funcs" - # eclass are defective, returning nonsensical placeholder strings if the - # end user has *NOT* explicitly configured their C++ compiler to be Clang. - # PySide2 does *NOT* care whether the end user has done so or not, as - # PySide2 unconditionally requires Clang in either case. This requires us - # to temporarily coerce the "${CPP}" environment variable identifying the - # current C++ compiler to "clang" immediately *BEFORE* calling such a - # function and then restoring that variable to its prior state immediately - # *AFTER* returning from that function call merely to force the - # clang-fullversion() function called below to return sanity. See also: - # https://bugs.gentoo.org/619490 - _CPP_old="$(tc-getCPP)" - CPP=clang - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(clang-fullversion)'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - CPP="${_CPP_old}" - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DDISABLE_DOCSTRINGS=$(usex !docstrings) - ) - - shiboken2_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake-utils_src_configure - } - python_foreach_impl shiboken2_configure -} - -src_compile() { - python_foreach_impl cmake-utils_src_compile -} - -src_test() { - python_foreach_impl cmake-utils_src_test -} - -src_install() { - shiboken2_install() { - cmake-utils_src_install - python_optimize - - # Uniquify the "shiboken2" executable for the current Python target, - # preserving an unversioned "shiboken2" file arbitrarily associated - # with the last Python target. - cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die - - # Uniquify the Shiboken2 pkgconfig file for the current Python target, - # preserving an unversioned "shiboken2.pc" file arbitrarily associated - # with the last Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl shiboken2_install - - # CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so" - # library and one "shiboken2" executable linked to one Python interpreter. - # See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i \ - -e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - -e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die - - # Remove the broken "shiboken_tool.py" script. By inspection, this script - # reduces to a noop. Moreover, this script raises the following exception: - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' - rm "${ED}"/usr/bin/shiboken_tool.py -} diff --git a/dev-python/shiboken2/shiboken2-5.15.1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1.ebuild new file mode 100644 index 000000000000..14a5d6181a28 --- /dev/null +++ b/dev-python/shiboken2/shiboken2-5.15.1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# TODO: Split the "/usr/bin/shiboken2" binding generator from the +# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former +# requires everything (including Clang) at runtime; the latter only requires +# Qt and Python at runtime. Note that "pip" separates these two as well. See: +# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding +# Once split, the PySide2 ebuild should be revised to require +# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) + +inherit cmake llvm python-r1 toolchain-funcs + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python binding generator for C++ libraries" +HOMEPAGE="https://wiki.qt.io/PySide2" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" + +# The "sources/shiboken2/libshiboken" directory is triple-licensed under the +# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 +# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be +# arbitrarily relicensed. (TODO) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+docstrings numpy test vulkan" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +#tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2):5" + +# Since Clang is required at both build- and runtime, BDEPEND is omitted here. +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtcore-${QT_PV} + >=sys-devel/clang-6:= + docstrings? ( + >=dev-libs/libxml2-2.6.32 + >=dev-libs/libxslt-1.1.19 + >=dev-qt/qtxml-${QT_PV} + >=dev-qt/qtxmlpatterns-${QT_PV} + ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) +" +DEPEND="${RDEPEND} + test? ( >=dev-qt/qttest-${QT_PV} ) +" + +S=${WORKDIR}/${MY_P}/sources/shiboken2 +DOCS=( AUTHORS ) + +# Ensure the path returned by get_llvm_prefix() contains clang as well. +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_prepare() { + # TODO: File upstream issue requesting a sane way to disable NumPy support. + if ! use numpy; then + sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ + libshiboken/CMakeLists.txt || die + fi + + # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" + # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". + if use vulkan; then + sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \ + ApiExtractor/clangparser/compilersupport.cpp || die + fi + + # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" + # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the + # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is + # the largest version specifier that exists under the "/usr/lib/clang/" + # subdirectory. This assumption is false in edge cases, including when + # users downgrade from newer Clang versions but fail to remove those + # versions with "emerge --depclean". See also: + # https://github.com/leycec/raiagent/issues/85 + # + # Sadly, the clang-* family of functions exported by the "toolchain-funcs" + # eclass are defective, returning nonsensical placeholder strings if the + # end user has *NOT* explicitly configured their C++ compiler to be Clang. + # PySide2 does *NOT* care whether the end user has done so or not, as + # PySide2 unconditionally requires Clang in either case. This requires us + # to temporarily coerce the "${CPP}" environment variable identifying the + # current C++ compiler to "clang" immediately *BEFORE* calling such a + # function and then restoring that variable to its prior state immediately + # *AFTER* returning from that function call merely to force the + # clang-fullversion() function called below to return sanity. See also: + # https://bugs.gentoo.org/619490 + _CPP_old="$(tc-getCPP)" + CPP=clang + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(clang-fullversion)'/include"))~' \ + ApiExtractor/clangparser/compilersupport.cpp || die + CPP="${_CPP_old}" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DDISABLE_DOCSTRINGS=$(usex !docstrings) + ) + + shiboken2_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_PYTHON_VERSION="${EPYTHON#python}" + ) + # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. + LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake_src_configure + } + python_foreach_impl shiboken2_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + python_foreach_impl cmake_src_test +} + +src_install() { + shiboken2_install() { + cmake_src_install + python_optimize + + # Uniquify the "shiboken2" executable for the current Python target, + # preserving an unversioned "shiboken2" file arbitrarily associated + # with the last Python target. + cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die + + # Uniquify the Shiboken2 pkgconfig file for the current Python target, + # preserving an unversioned "shiboken2.pc" file arbitrarily associated + # with the last Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl shiboken2_install + + # CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so" + # library and one "shiboken2" executable linked to one Python interpreter. + # See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i \ + -e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ + -e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die + + # Remove the broken "shiboken_tool.py" script. By inspection, this script + # reduces to a noop. Moreover, this script raises the following exception: + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' + rm "${ED}"/usr/bin/shiboken_tool.py +} -- cgit v1.3.1