[gentoo-commits] repo/gentoo:master commit in: dev-python/pyotherside/files/, dev-python/pyotherside/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyotherside/files/, dev-python/pyotherside/

[Michał Górny]

commit:     4ab8df14be912440574b07476c8cf51e4441f9c6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 11:32:44 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 11:38:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab8df14

dev-python/pyotherside: Remove old

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

 dev-python/pyotherside/Manifest                    |   1 -
 .../files/pyotherside-1.6.0-qt6.5.patch            |  34 -------
 dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild | 106 ---------------------
 dev-python/pyotherside/pyotherside-1.6.0.ebuild    |  66 -------------
 4 files changed, 207 deletions(-)

diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index 7a770678cc78..5c064d96db65 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,2 +1 @@
-DIST pyotherside-1.6.0.tar.gz 183645 BLAKE2B e2a12a9a96f3672a5e322c9f2e84d485b8086bdcacfc6586e0c23f6dd730d3e66cea66618540fd9a304480a9ab86386e2fe0136047c59f70bfa3b5cff9e8e76e SHA512 57835db9d65fae10e6b3ec8ab37793e316324e7a819a1045436adf9eabdee11ccf3090a4db0302283b236e77e5e0bd14cf92ed1430835ccc324e50085a872787
 DIST pyotherside-1.6.1.tar.gz 184539 BLAKE2B 32c017b6d3a64a3125f779a0201ee15288fbcc84bf070442dc542df525f5994cee6b334d86ff2bbbcada39f645ac2e900a459d729c4f8c838d529fb33bdf1226 SHA512 ea672405b97d09b3c4f1266b1714da5e127c47f8f1c99caa282bd823261c06a0b02e7094185724863f339a0bd35d45426bdf6e8cb7d37a8a23d1d18e81939d9d

diff --git a/dev-python/pyotherside/files/pyotherside-1.6.0-qt6.5.patch b/dev-python/pyotherside/files/pyotherside-1.6.0-qt6.5.patch
deleted file mode 100644
index 08844cc8338d..000000000000
--- a/dev-python/pyotherside/files/pyotherside-1.6.0-qt6.5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 45044252aaf73262cd46443acd049e7afcdf072b Mon Sep 17 00:00:00 2001
-From: Thomas Perl <m@thp.io>
-Date: Sat, 2 Dec 2023 18:46:06 +0100
-Subject: [PATCH] Fix build error with Qt >= 6.5 (fixes #128)
-
---- a/src/qpython_priv.cpp
-+++ b/src/qpython_priv.cpp
-@@ -405,8 +405,25 @@ pyotherside_QObjectMethod_call(PyObject *callable_object, PyObject *args, PyObje
-             }
- 
-             QVariant result;
-+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
-+            QGenericReturnArgument returnArg = Q_RETURN_ARG(QVariant, result);
-+#else
-+            /**
-+             * Starting with Qt 6.5, Q_RETURN_ARG() expands to a QMetaMethodReturnArgument,
-+             * whereas previously it returned a QGenericReturnArgument. Since we are using
-+             * the old, deprecated QMetaMethod::invoke() functions, and those take a
-+             * QGenericReturnArgument and not a QMetaMethodReturnArgument, we need to
-+             * create the QGenericReturnArgument ourselves by emulating what Q_RETURN_ARG()
-+             * does in old Qt versions before 6.5.
-+             *
-+             * See also:
-+             * https://bugreports.qt.io/browse/QTBUG-113147
-+             * https://github.com/thp/pyotherside/issues/128
-+             **/
-+            QGenericReturnArgument returnArg {QT_STRINGIFY(QVariant), &result};
-+#endif
-             if (method.invoke(o, Qt::DirectConnection,
--                    Q_RETURN_ARG(QVariant, result), genericArguments.value(0),
-+                    returnArg, genericArguments.value(0),
-                     genericArguments.value(1), genericArguments.value(2),
-                     genericArguments.value(3), genericArguments.value(4),
-                     genericArguments.value(5), genericArguments.value(6),

diff --git a/dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild b/dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild
deleted file mode 100644
index 44c3228186f8..000000000000
--- a/dev-python/pyotherside/pyotherside-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit multibuild qmake-utils python-single-r1
-
-DESCRIPTION="Asynchronous Python 3 Bindings for Qt"
-HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
-SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="qt5 qt6"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( qt5 qt6 )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[opengl]
-		dev-qt/qtdeclarative:6[opengl]
-		dev-qt/qtquick3d:6[opengl]
-		dev-qt/qtsvg:6
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-qt6.5.patch
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
-	python_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/qtquicktests//" pyotherside.pro || die
-	multibuild_copy_sources
-}
-
-src_configure() {
-	myconfigure() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-
-		if [[ "${MULTIBUILD_VARIANT}" == qt5 ]]; then
-			eqmake5
-		elif [[ "${MULTIBUILD_VARIANT}" == qt6 ]]; then
-			eqmake6
-		else
-			# This should never happen if REQUIRED_USE is enforced
-			die "Neither Qt5 nor Qt6 support enabled, aborting"
-		fi
-		popd > /dev/null || die
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	mycompile() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-
-		emake
-
-		popd > /dev/null || die
-	}
-
-	multibuild_foreach_variant mycompile
-}
-
-src_test() {
-	mytest() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-
-		QT_QPA_PLATFORM="offscreen" tests/tests || die
-
-		popd > /dev/null || die
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	myinstall() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-
-		emake install INSTALL_ROOT="${D}"
-
-		popd > /dev/null || die
-	}
-
-	multibuild_foreach_variant myinstall
-}

diff --git a/dev-python/pyotherside/pyotherside-1.6.0.ebuild b/dev-python/pyotherside/pyotherside-1.6.0.ebuild
deleted file mode 100644
index f151aceda94f..000000000000
--- a/dev-python/pyotherside/pyotherside-1.6.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit qmake-utils python-single-r1
-
-DESCRIPTION="Asynchronous Python 3 Bindings for Qt"
-HOMEPAGE="https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/"
-SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+qt5 qt6"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( qt5 qt6 )"
-
-# TODO: multibuild for both qt5 and qt6 if requested
-RDEPEND="
-	${PYTHON_DEPS}
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[opengl]
-		dev-qt/qtdeclarative:6[opengl]
-		dev-qt/qtquick3d:6[opengl]
-		dev-qt/qtsvg:6
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-qt6.5.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s/qtquicktests//" pyotherside.pro || die
-}
-
-src_configure() {
-	if use qt5; then
-		eqmake5
-	elif use qt6; then
-		eqmake6
-	else
-		# This should never happen if REQUIRED_USE is enforced
-		die "Neither Qt5 nor Qt6 support enabled, aborting"
-	fi
-}
-
-src_test() {
-	QT_QPA_PLATFORM="offscreen" tests/tests || die
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}