From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-python/shiboken2/Manifest | 4 +- dev-python/shiboken2/shiboken2-5.14.2.ebuild | 169 --------------------------- dev-python/shiboken2/shiboken2-5.15.1.ebuild | 169 +++++++++++++++++++++++++++ 3 files changed, 171 insertions(+), 171 deletions(-) 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/shiboken2') diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index 34ec3d379645..d0605e7664f3 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -1,3 +1,3 @@ -DIST pyside-setup-opensource-src-5.14.2.tar.xz 3238036 BLAKE2B 454f19ae4e154747bad2b833727ab62ded15bbac495cc0bef112ce6cccdd69bb5bb541c9b31125bd05090bfce042bac2ac8b47690c695e82b5c901e45e87f681 SHA512 6708c4ebb115119796756ccac89197e111eb27c4a91f52875da04eff4ca6f9e3fffefc18cc0219a8c3a3c81a667bf7509909a6d1d9ff1ee2cc0d957453cceffa -EBUILD shiboken2-5.14.2.ebuild 6621 BLAKE2B a16591525ff4396498d4d57c6f513b548ba5b39454927cc2b51ea108f390c0d4c981448a4200bcdd13c17a360134be540adcc3d93c14f305f230cd4461a9310a SHA512 90266606d682ac8543d8e4db03606b35e8cee17df9ec960836983d3947e901b14fd618bcea85842cf66a48ea1a27aa81971d937b5f3860bf94bf878a0c270bf6 +DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306 +EBUILD shiboken2-5.15.1.ebuild 6585 BLAKE2B 9f180c3778fc96540bcfaef881fc8bd6ee8530f8eefcac546c3ce23534feba99bb13f40b170d4816ecea2256f4a0ba499f12018b06ffbd4c87c15656f4b025a4 SHA512 9671522a3dedc59a242c5c27d6710874d59557873d6fa4504e9472b62e66bf03578f383c8f0133aec0a05c5b704b6ec841bd90e88084c434395728bd501deb3b MISC metadata.xml 503 BLAKE2B 37ba81030aa2393583ae7eece0a0f9a542d7bc7d4f2b8e8a434e366d7fc8a24045b6fa0bc667355cd36fcc9866333c30efaf5da026b567f02357dc69e411a202 SHA512 ab55f2d1d33be0746ff7a2056a6dcd774089d356f8162338f8f9071a03c5e6a2cd09d665aae2232b32c53ef9b50b86e7726210376ed38d981397c522620639bb 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 aa293aaad1eb..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_{6,7,8} ) - -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..9877a168f1f4 --- /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_{6,7,8} ) + +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.2.3