gentoo auto-resync : 12:06:2024 - 00:08:13

5 files changed, 104 insertions, 7 deletions

diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest
index 7f08ceba2b56..36b2d914940c 100644
--- a/sci-libs/libsigrokdecode/Manifest
+++ b/sci-libs/libsigrokdecode/Manifest
@@ -1,4 +1,6 @@
+AUX libsigrokdecode-0.5.3-py3.13.patch 1214 BLAKE2B e102818a60fa3a8c773c3e6770d6e485e27f04040a99dd64b3449555ba5885e1ebc00e2f1c3b1fed8fac29fa95ec969c672ee1f32bfe9da7115a97a63302a4d7 SHA512 9c8f347b6a582c1fed2f3e21d830c2457fb85a1dee8498a0b863a7ca96f0a24b3b2d1ae631f8282e7c080a03031c250e3eb7bfae301df219a3ac56efc20550ee
 DIST libsigrokdecode-0.5.3.tar.gz 892783 BLAKE2B 45bae2488e4872be3bb891813083ed540617ac88558bb6c2d971fbb0c05585d3fcb74192fc83ce7d67ee466bc04c61fbccf6f475e549b80c86fe5f0cc191c7c1 SHA512 23393504b68135ed4ae8e8a654df024620af02e84fa3955956c61899388812229108155b4ae8d946e61f33dc8a8807db090d608350548a7a717d966442b07b9e
-EBUILD libsigrokdecode-0.5.3-r2.ebuild 1096 BLAKE2B c19aec64543d9be8f3163cde60db0eead9f67da219dec7851386c7e0230c12e046541a0c393a65b6c3ee2077e4cf5e415f7e0ee1b488a1e67b6d55117dab2b05 SHA512 4a38dd9476b55d6ae16e407c4ca9241b820be7d2cfaca5c6774ede4bec6c64e9481403f23b7663834b916bf11c1c236f82891e5139dfe0849a0e2833361cf6f7
-EBUILD libsigrokdecode-9999.ebuild 1099 BLAKE2B b63f0c5489d6e8b91a6c7f55c7430e2aad9b641c7289d8335f8b99c25edba8192dbd19556e71297e8c4e93165703258fcf70bd321c846b4212c4163e64feeafd SHA512 1a7d3265095348ddbb80d03a2bcf3d52f24191c492e672735f243f2974ff9c325b7ba7078f33adf966b53e4ee1bc77efb8ff5f307a42201de2c95f9a57f5a6a0
+EBUILD libsigrokdecode-0.5.3-r2.ebuild 1097 BLAKE2B b0cd034c3158805f27ef2b62d9f9308eade00e9526c80f214924c9dd22d9065faefe1ed98f45c54e306c7e1d12c51455b9cbb4c2e039d4c1f535d6d4e07d68e7 SHA512 93679a8094c05130d095ef66d9b6a5bd1b33f25a1cbb31885224e46513605a56c3db6a2a48e5e8cdddf5ffbe2c05a76325bd3f15a35bfcc30aae59d99693170d
+EBUILD libsigrokdecode-0.5.3-r3.ebuild 1143 BLAKE2B fd2795591b6d92a2ca458df64af72c12318aab57235682c52e711905c18c20e00375dd172a57d221691cc04b08eb09380d7d84766550659693a210fa5a671943 SHA512 1a07d677d90257750bdf5a99dcce81631b7871bebdfbf5460ba1d4ad375e2b2a8b9abf4a10206970af1f3359df4a77023554fe5066638f24a68494ed2009e515
+EBUILD libsigrokdecode-9999.ebuild 1097 BLAKE2B 6d3401361aa9c05208b440185e03991d9621a6dcc46b36eb36843bbedb8415aabb5ca6e7b5acaad515d3f4e9d1732a3ac7bd2b4da999998f1ea8ab185046afbe SHA512 3f29b010eba26ff4145031dfb03146933be668f72e4a3c0e53849a8d7a4fc97fba23e2b2cd5747158a29a9af323217212ed203d287c49423c36d995f9f031bd1
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch
new file mode 100644
index 000000000000..89078b3ba70e
--- /dev/null
+++ b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.5.3-py3.13.patch
@@ -0,0 +1,37 @@
+http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff;h=0c35c5c5845d05e5f624c99d58af992d2f004446
+
+From: Sascha Silbe <redacted>
+Date: Mon, 23 Oct 2023 20:21:38 +0000 (+0200)
+Subject: srd: drop deprecated PyEval_InitThreads() on Python 3.9+
+X-Git-Url: http://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=0c35c5c5845d05e5f624c99d58af992d2f004446
+
+srd: drop deprecated PyEval_InitThreads() on Python 3.9+
+
+`PyEval_InitThreads()` is called implicitly during `Py_InitializeEx()`
+since Python 3.7. It has been deprecated since 3.9 and dropped in
+3.13.
+
+[ gsi: touch up comment style ]
+---
+
+diff --git a/srd.c b/srd.c
+index 35ec5f2..10dfaf6 100644
+--- a/srd.c
++++ b/srd.c
+@@ -302,8 +302,14 @@ SRD_API int srd_init(const char *path)
+ 		g_strfreev(dir_list);
+ 	}
+ 
+-	/* Initialize the Python GIL (this also happens to acquire it). */
++#if PY_VERSION_HEX < 0x03090000
++	/*
++	 * Initialize and acquire the Python GIL. In Python 3.7+ this
++	 * will be done implicitly as part of the Py_InitializeEx()
++	 * call above. PyEval_InitThreads() was deprecated in 3.9.
++	 */
+ 	PyEval_InitThreads();
++#endif
+ 
+ 	/* Release the GIL (ignore return value, we don't need it here). */
+ 	(void)PyEval_SaveThread();
+
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
index 617e1edb0d21..72015cba5833 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit autotools python-single-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild
new file mode 100644
index 000000000000..0e58fddc4fb2
--- /dev/null
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools python-single-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Provide (streaming) protocol decoding functionality"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.34.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py3.13.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #794592
+	sed -i -e "s/\[SRD_PKGLIBS\],\$/& [python-${EPYTHON#python}-embed], [python-${EPYTHON#python}],/" configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) PYTHON3="${PYTHON}"
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+	python_optimize "${D}"/usr/share/libsigrokdecode/decoders
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
index 8f04c30aebba..193ac833026d 100644
--- a/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
+++ b/sci-libs/libsigrokdecode/libsigrokdecode-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools python-single-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -18,7 +18,7 @@ DESCRIPTION="Provide (streaming) protocol decoding functionality"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode"
 
 LICENSE="GPL-3"
-SLOT="0/9999"
+SLOT="0/4"
 IUSE="static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"