From bdf6e70da7a28f45617c02a251bb6b3844202bc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Jan 2023 20:52:36 +0000 Subject: gentoo auto-resync : 28:01:2023 - 20:52:36 --- dev-python/shiboken2/Manifest | 4 +- dev-python/shiboken2/shiboken2-5.15.6.ebuild | 174 --------------------------- dev-python/shiboken2/shiboken2-5.15.7.ebuild | 2 +- 3 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 dev-python/shiboken2/shiboken2-5.15.6.ebuild (limited to 'dev-python/shiboken2') diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index cbf786872c0c..64ad7a7ff2c0 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -4,10 +4,8 @@ AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4 AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14 AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4bc4586fb7ffdd8dfed80bf6315a70c86882f98250e42235ff27265b6c3a4e65e8dd7b233b61201a33808985ffb50e929bc8b5deb864f SHA512 4f608eb93fb72f81a9327699b14d4451261831f5079fac12aa88ce17ac30fc846bd9b461b8f6a4780727507b388f675a116f55ef1c240ced33d941315af4d21c AUX shiboken2-5.15.8-py-limited-api.patch 527 BLAKE2B a27886393ff917dbf3b1318d44d998e574e87ce79dbcc694dedb2dc9da7c173c87b40eb8d6296d2f1f7d6bd3ccffa2e5ae9a11e97a2f4e436d4902b2a447513c SHA512 579b88892e05b2e313f14adebaf62e399fd3f9981955e15a762196ca405b0dccc254edfd941727f777ea97709272475c8df239991d2aa7491e200c61dd66a583 -DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4 DIST pyside-setup-opensource-src-5.15.7.tar.xz 3581144 BLAKE2B 95b5720a5273c96b00bdf86b36734970991a29cf0db1e6fb2c00d7e671fbc4459b4434abc91a8a47ec5d8ba694bcdae5b57a52448908fdca25c348f9ee2b6c81 SHA512 9c551b47581e4f2671c4378f1a2c0d9e565b08edee74244a7704a2c94eef1e1041d23f0e388c07bdd61067e986340907cf80f4527257a9a706f7f07c497834c6 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22 -EBUILD shiboken2-5.15.6.ebuild 6693 BLAKE2B a0e4edb74c672a5bbfec82df08df9b19700895bb6d844c9a71a6f1683d0414c8bae705310a9642f6704d8bd68547f7b64e5ab61452c48f2a9a400e6e2b30bd56 SHA512 871dd56986d803c46820ea5537469fcbaea696c66faeaf50dda216fa83f37dab3c70a18cb4bffdb3c67c41519712712fd5a262115d880f7d96c6129998157745 -EBUILD shiboken2-5.15.7.ebuild 6691 BLAKE2B 745cb283730ef6c973703f75a7d25569ee6a729a0f0ee1ddde8a64e1714c2abaeb2443db588554685c8df52b3e321b05399ccb0dd48e133f3faf011eb1c48874 SHA512 6536bcc1f0210a8b163d65eb74e9e04dccccccae241799928b5fe281282619ce73056ac0eabad9b958e24c7eb4fa6ac34c82be8ed04a553559d7a04274aef30c +EBUILD shiboken2-5.15.7.ebuild 6690 BLAKE2B f9e0e9abf8bfeea66d9a9575b165c1622a5594899c7ae8e7d5a7aab4529616e59bcab140dc66f5d959bf3048e913150dfca47a403ed30b7b3e9e47d6994ebac6 SHA512 9f0d279062ee045426cd34c84e526bcf02d0daeaa12a0fae27876f683844097bb1dc03e785c6193812ab1e9cf217a8998c024d5d1918c94fd111ec1543241ba5 EBUILD shiboken2-5.15.8.ebuild 6742 BLAKE2B 2ce7b18aa89621328e2f9fd34218a02438946e8ca8c07f7c85bbaabacc0d8e52244a0f6b075083d47374947035affcca7a2a94a88482ccc22faea339d536bfd1 SHA512 b505352ac4334326d0c17874f5f1b9b14861c7c6e78f208b63f94b11a3053bb8e9b06ec5360e4a7d69e9ac0c13203bb4d8d07724a899970f6f96942b1f2fb0b2 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24 diff --git a/dev-python/shiboken2/shiboken2-5.15.6.ebuild b/dev-python/shiboken2/shiboken2-5.15.6.ebuild deleted file mode 100644 index d0a1dd9d695e..000000000000 --- a/dev-python/shiboken2/shiboken2-5.15.6.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# 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_{9..11} ) - -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" -S="${WORKDIR}/${MY_P}/sources/shiboken2" - -# 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 ~arm arm64 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. -LLVM_MAX_SLOT=15 -RDEPEND="${PYTHON_DEPS} - >=dev-qt/qtcore-${QT_PV} - =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} ) -" - -DOCS=( AUTHORS ) - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.5-python311-1.patch - "${FILESDIR}"/${PN}-5.15.5-python311-2.patch - "${FILESDIR}"/${PN}-5.15.5-python311-3.patch - "${FILESDIR}"/${PN}-5.15.6-fix-pyside2-compile.patch - "${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch -) - -# 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. See also: - # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # Minimal tests for now, 2 failing with the extended version - # FIXME Subscripted generics cannot be used with class and instance checks - 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. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - 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-${CMAKE_BUILD_TYPE,,}.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 || die -} diff --git a/dev-python/shiboken2/shiboken2-5.15.7.ebuild b/dev-python/shiboken2/shiboken2-5.15.7.ebuild index 172bb540a315..ce1269accfbc 100644 --- a/dev-python/shiboken2/shiboken2-5.15.7.ebuild +++ b/dev-python/shiboken2/shiboken2-5.15.7.ebuild @@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2" # arbitrarily relicensed. (TODO) LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~x86" +KEYWORDS="amd64 ~arm arm64 x86" IUSE="+docstrings numpy test vulkan" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -- cgit v1.2.3