public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken2/
Date: Sat, 28 Jan 2023 19:56:12 +0000 (UTC)	[thread overview]
Message-ID: <1674935580.9af389996baf8d8b9da3e47aa435bc66f80a02b3.mgorny@gentoo> (raw)

commit:     9af389996baf8d8b9da3e47aa435bc66f80a02b3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 19:53:00 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 19:53:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af38999

dev-python/shiboken2: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/shiboken2/Manifest                |   1 -
 dev-python/shiboken2/shiboken2-5.15.6.ebuild | 174 ---------------------------
 2 files changed, 175 deletions(-)

diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 90a7c7a3f1c8..6d6de27407b4 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,3 +1,2 @@
-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

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}
-	<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.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
-}


             reply	other threads:[~2023-01-28 19:56 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-28 19:56 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-06 16:43 [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken2/ Andreas Sturmlechner
2024-06-01 15:59 Arthur Zamarin
2024-06-01 10:25 Arthur Zamarin
2024-05-30 15:35 Andrew Ammerlaan
2024-04-04  4:23 Arthur Zamarin
2024-04-03 20:45 Arthur Zamarin
2024-03-24 20:38 Andrew Ammerlaan
2024-02-11 14:38 Andrew Ammerlaan
2024-02-01 23:37 Andreas Sturmlechner
2024-01-31  7:18 Joonas Niilola
2024-01-29  4:22 Ionen Wolkens
2024-01-03 12:02 Andrew Ammerlaan
2023-12-03  5:45 Arthur Zamarin
2023-10-09 10:41 Andrew Ammerlaan
2023-10-06  7:43 Andrew Ammerlaan
2023-10-03 15:27 Andrew Ammerlaan
2023-10-03 14:27 Andrew Ammerlaan
2023-09-11  6:48 Jakov Smolić
2023-07-24 22:50 Sam James
2023-07-24 21:02 Sam James
2023-07-24 12:56 Michał Górny
2023-06-14 19:59 Andrew Ammerlaan
2023-05-27 13:42 Arthur Zamarin
2023-05-26  7:18 Sam James
2023-05-23 17:50 Arthur Zamarin
2023-04-11 18:12 Andrew Ammerlaan
2023-03-05 11:05 Michał Górny
2023-03-05  7:39 Arthur Zamarin
2023-02-07 17:47 Sam James
2023-02-07 16:54 Sam James
2023-01-28 18:58 Arthur Zamarin
2022-12-04 23:31 Sam James
2022-12-04 21:32 Sam James
2022-11-07 11:05 Andrew Ammerlaan
2022-11-04  8:38 Michał Górny
2022-11-04  8:16 Agostino Sarubbo
2022-11-03 22:04 Sam James
2022-11-03 19:18 Arthur Zamarin
2022-10-24  5:14 Michał Górny
2022-09-23 11:26 Andrew Ammerlaan
2022-09-01 19:13 Sam James
2022-08-29 14:31 Sam James
2022-08-13 14:18 Andrew Ammerlaan
2022-08-12 15:13 Andrew Ammerlaan
2022-08-03  9:00 Michał Górny
2022-08-03  4:38 Arthur Zamarin
2022-08-02 20:27 Sam James
2022-08-02 20:27 Sam James
2022-07-18 10:22 Sam James
2022-02-25 18:53 Arthur Zamarin
2021-10-17  9:41 Michał Górny
2021-09-03  1:53 Sam James
2021-07-19 18:36 Sam James
2021-07-19 18:36 Sam James
2021-07-18 10:23 Andrew Ammerlaan
2021-07-05 22:35 Sam James
2021-06-02 17:31 Rick Farina
2021-06-01 17:07 Andrew Ammerlaan
2021-05-30  9:45 Agostino Sarubbo
2021-05-18  6:29 Agostino Sarubbo
2021-02-21  8:06 Sam James
2020-10-14 15:38 Rick Farina
2020-10-14 15:38 Rick Farina
2020-05-22 17:23 Rick Farina
2020-05-22 17:23 Rick Farina
2020-05-22 17:23 Rick Farina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1674935580.9af389996baf8d8b9da3e47aa435bc66f80a02b3.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox