dev-python/pytqt: several changes

* fix FTBFS in stables
* add python_optimize calls
* add correct python version to DEPENDs

Bug: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/405
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

5 files changed, 62 insertions, 10 deletions

diff --git a/dev-python/pytqt/files/pytqt-pytquic.patch b/dev-python/pytqt/files/pytqt-14.1.2-Changing-string-types-to-bytes-for-pytquic.patch
index 09119cd2..09119cd2 100644
--- a/dev-python/pytqt/files/pytqt-pytquic.patch
+++ b/dev-python/pytqt/files/pytqt-14.1.2-Changing-string-types-to-bytes-for-pytquic.patch
diff --git a/dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch b/dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch
new file mode 100644
index 00000000..f23b1b5d
--- /dev/null
+++ b/dev-python/pytqt/files/pytqt-14.1.2-Fix-FTBFS-with-Python-3.13.patch
@@ -0,0 +1,40 @@
+From 5afb6e8ec49253cda4285b4a0ca76a37f0d30689 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
+Date: Wed, 25 Sep 2024 21:01:39 +0200
+Subject: [PATCH 1/3] Fix FTBFS with Python 3.13. This solves issue #32.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: François Andriot <albator78@libertysurf.fr>
+(cherry picked from commit d0ab12dc39963aa28698943bf4ad88d3fd3d4c51)
+---
+ sip/tqt/tqstring.sip | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/sip/tqt/tqstring.sip b/sip/tqt/tqstring.sip
+index 8ef101f..6e09d0f 100644
+--- a/sip/tqt/tqstring.sip
++++ b/sip/tqt/tqstring.sip
+@@ -890,9 +890,16 @@ const char *PyTQt_tqt_encode(PyObject **s, TQApplication::Encoding encoding)
+         es = PyBytes_AS_STRING(obj);
+         Py_INCREF(obj);
+     }
+-    else if (PyObject_AsCharBuffer(obj, &es, &sz) >= 0)
++    else
+     {
+-        Py_INCREF(obj);
++        Py_buffer view;
++
++        if (PyObject_GetBuffer(obj, &view, PyBUF_SIMPLE) == 0) {
++            es = (const char*)view.buf;
++            sz = view.len;
++            PyBuffer_Release(&view);
++            Py_INCREF(obj);
++        }
+     }
+ 
+     if (es)
+-- 
+2.49.1
+
diff --git a/dev-python/pytqt/pytqt-14.1.2.ebuild b/dev-python/pytqt/pytqt-14.1.1-r1.ebuild
index 928f9c12..814d7ab6 100644
--- a/dev-python/pytqt/pytqt-14.1.2.ebuild
+++ b/dev-python/pytqt/pytqt-14.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 The Trinity Desktop Project
+# Copyright 2022-2025 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -19,7 +19,7 @@ IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	~dev-python/sip4-tqt-${PV}
+	~dev-python/sip4-tqt-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~x11-libs/tqscintilla-${PV}
 	~dev-tqt/tqtinterface-${PV}
 "
@@ -28,9 +28,13 @@ RDEPEND="${DEPEND}"
 TQBASE="/usr/tqt3"
 BUILD_DIR="${S}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-Changing-string-types-to-bytes-for-pytquic.patch"
+	"${FILESDIR}/${PN}-14.1.2-Fix-FTBFS-with-Python-3.13.patch"
+)
+
 src_prepare() {
-	eapply "${FILESDIR}/${PN}-pytquic.patch"
-	eapply_user
+	default
 }
 
 src_configure() {
@@ -66,4 +70,5 @@ src_install() {
 			doins "examples/${EDIR}"/*
 		done
 	fi
+	python_optimize
 }
diff --git a/dev-python/pytqt/pytqt-14.1.1.ebuild b/dev-python/pytqt/pytqt-14.1.2-r1.ebuild
index 06db22cb..7d8a0212 100644
--- a/dev-python/pytqt/pytqt-14.1.1.ebuild
+++ b/dev-python/pytqt/pytqt-14.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 The Trinity Desktop Project
+# Copyright 2022-2025 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -19,7 +19,7 @@ IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	~dev-python/sip4-tqt-${PV}
+	~dev-python/sip4-tqt-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~x11-libs/tqscintilla-${PV}
 	~dev-tqt/tqtinterface-${PV}
 "
@@ -28,8 +28,13 @@ RDEPEND="${DEPEND}"
 TQBASE="/usr/tqt3"
 BUILD_DIR="${S}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-Changing-string-types-to-bytes-for-pytquic.patch"
+	"${FILESDIR}/${P}-Fix-FTBFS-with-Python-3.13.patch"
+)
+
 src_prepare() {
-	eapply_user
+	default
 }
 
 src_configure() {
@@ -65,4 +70,5 @@ src_install() {
 			doins "examples/${EDIR}"/*
 		done
 	fi
+	python_optimize
 }
diff --git a/dev-python/pytqt/pytqt-9999.ebuild b/dev-python/pytqt/pytqt-9999.ebuild
index f2fe1e57..e000c8ec 100644
--- a/dev-python/pytqt/pytqt-9999.ebuild
+++ b/dev-python/pytqt/pytqt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 The Trinity Desktop Project
+# Copyright 2022-2025 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -19,7 +19,7 @@ IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	~dev-python/sip4-tqt-${PV}
+	~dev-python/sip4-tqt-${PV}[${PYTHON_SINGLE_USEDEP}]
 	~x11-libs/tqscintilla-${PV}
 	~dev-tqt/tqt-${PV}
 "
@@ -29,7 +29,7 @@ TQBASE="/usr/tqt3"
 BUILD_DIR="${S}"
 
 src_prepare() {
-	eapply_user
+	default
 }
 
 src_configure() {
@@ -65,4 +65,5 @@ src_install() {
 			doins "examples/${EDIR}"/*
 		done
 	fi
+	python_optimize
 }