gentoo auto-resync : 15:06:2023 - 13:38:09

2 files changed, 175 insertions, 0 deletions

diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 61cb00eb872b..e5ffe9e49bbc 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -4,8 +4,10 @@ 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.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22
 DIST pyside-setup-opensource-src-5.15.9.tar.xz 3581660 BLAKE2B 65d5317f9ea55385bbe093cf43c214655effd877feed6409acc4f6f65768dcde8c94c4f29157f8d7dcb36d442c649290764706834885b08ecf9934b383b3e2a4 SHA512 cc63d64b909f1fd98b64a0bba61b278b1a5b60059168287546ee36204ede2df4317eb4ce5638a268d387e6db40fec203631fc4a48e4116a6b4a30d675bf876d3
+EBUILD shiboken2-5.15.10.ebuild 6634 BLAKE2B b12c70233571b9c483c00b02386c71ca22fd5b8602a3f6a4bbf273598bccf2602ba550c8b62454def4a2a24320a450385361874b66d801ac493679bfdbc31b9d SHA512 324c1e1583bac46f1615306de3da679a795521c2bccf9254f9f4a15ef44f7f1e91f840e7cd0b8ef5c8c96c15cba97594faeaf033d59a3a5ed99df66667332e67
 EBUILD shiboken2-5.15.8.ebuild 6739 BLAKE2B fd67d3f2035cdf39bba9d463a6ffa38b36095d7a80cd412d95df9d051e299624ac83c6dfe94016017feb3985a6f5793a25931781e0fc420347e9f9db2e94a46e SHA512 46f005dad362e9fa1f91ae71155379402d02c5680a8d5e295f932579ae290d0eec98def094e898c81f57af08d78c7bb714c74543c06f195a5d965c105a771fd6
 EBUILD shiboken2-5.15.9.ebuild 6734 BLAKE2B c73908fb4de247c194658d413b65bba5de8e5b165381e968a55ec86bbfd752049f6f435ab464b5202830ffae75b27a5ef408c23aca2026c04426e0f741469436 SHA512 80931441a77a052ba4bb549b8ec1213ae793dcdc3bd721a90fb4cf7bb3804e881a1beebac1781144093201959e44d9e0ff5aea8a1a65fc15912e97df499040ca
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/shiboken2-5.15.10.ebuild b/dev-python/shiboken2/shiboken2-5.15.10.ebuild
new file mode 100644
index 000000000000..9ec68bef9d5c
--- /dev/null
+++ b/dev-python/shiboken2/shiboken2-5.15.10.ebuild
@@ -0,0 +1,173 @@
+# 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}
+	<sys-devel/clang-16:=
+	<sys-devel/clang-runtime-16:=
+	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}	)
+"
+
+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.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*/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
+}