gentoo auto-resync : 18:07:2024 - 12:29:01

5 files changed, 130 insertions, 62 deletions

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 1952d886f14d..e6222a5f64af 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,7 +1,8 @@
-AUX pygobject-3.44.1-py312.patch 1941 BLAKE2B 93af1e4f307e003b7e9cd62b787efa9690724d2cc293ddc571563e7e0324771537d2dd92e6998d30066bb6707b73937cc8cbbca7926666e70f939d0f6cc86435 SHA512 98d470a39d5e3b3f25e41a516d62d364daf2eec92480b31ef80ad79bc3921f53a7fa05bab23be721889ccf8fcd939e5c0bf7d04efd935f7bf9f56bc2e596cc6b
-DIST pygobject-3.44.1.tar.xz 559432 BLAKE2B 7edfe91ac1b7301befaf8ef17078b517666467f446bfbe25850336cd365d314153d444d29ecf028ce44a12cef1c94f139d110ac6784c8a2c6077730d4836f6cc SHA512 5f2ff4a068e7e24dcc32f8c43ba58660c85a0fabdd9ff0bac4ddf1ca82bd0fc962ce5cb3ab25b991c212d45e5e89dac67c3259c5423a7d7fd70b2ac1f56e5327
+AUX pygobject-3.48.2-egg-info.patch 1298 BLAKE2B e392d0c782a0e837034649177e87ac922eb5848da44b9cafdd2378a171b4018b0a1746cafd0595bd26b206c1121549683bdaff22850590067c7ee21fff46efa9 SHA512 58d708d4495434c61df1bd4cdeb3492e1791e4e81861e3b8899e4acf608e3a0bd72b6aeb6d613cd98604e8ac5dcc75d3a12765d33ad2fc8b036867c6dd724b32
 DIST pygobject-3.46.0.tar.xz 561552 BLAKE2B 6b8c9b4bf6df819c09b7bd2ea6dcb0e7c24ed7f171487b774469bd2c4694df9d4473dbde05273afc7a370f2b1f352d60347aa221bdd674a4aa8a54123d5e54cd SHA512 48293c193ba5aece38d99f45d325d0329ac33e88442bf00848fe818a7c838977b8d2cf50a404c30e8852ccc0b4a44dfda07751d51acc21f740aa2ab6aa3ce661
-EBUILD pygobject-3.44.1.ebuild 1992 BLAKE2B 0dd334932fbfe25a72f394ff496b6c9bd291f0e3b62520bc5aeeda57324b783116ff7352e495cf37d7fe9d902ad49dc7f0e751aa5923a627fbf0bf4f5aae19c5 SHA512 145a1544194f896ccdd8c26fd5136970b90e660171ade50a1bbd2cbc8e4812bff86677829a6a5f7f6fb7cdc3b9baa4d54786c2bb00a1cc9736cff18a98b44520
+DIST pygobject-3.48.2.tar.xz 556244 BLAKE2B 6ac7a42752d65668f228aa9823a4e256b030bc84683857e5470bc373eaaf383904d18399379b4a7d0989644e2b0825d63cc8b3f927b97608a209f888bf8cb276 SHA512 11619f73be5894fae82b261779f33390d1aec51b02bcf285c58f3c76ee46dfc1b3f435e4662176fde5ca899aee5afc453f8f0ba28e15e15330a52354cf737d45
 EBUILD pygobject-3.46.0-r1.ebuild 1826 BLAKE2B 72f0cd263cb0476fe73c6826b2736a74f430b842e718371752cfc1082331949ba3ed5b4d564226872b11145e821975d91f947e86c674bd679603f78ab10e2fb1 SHA512 871ee43b34f6616299a34f977511c7ed4ff77ff1faca952e4244e37bfb53da4db83e279e8fef17b1cda55b475cdae788fe4f9a8bae04974f6ffd61fdb51f1e1d
 EBUILD pygobject-3.46.0.ebuild 1823 BLAKE2B 330f531b67a6321bb6a7d7e075f5100b308209a7af9f60f77f11664148c9495ccb9d446de8d42a0b485de7cee7d115a61565cdc2fadf5f810b5deb08df2a1968 SHA512 8b98d9403ddeff8d3b46b129e2e0731178ef3488f8389468d079eca84b27b8a992eaa1aacaa27e73aa39e899e129a4ea617a284aee9916f360fb18da06a62635
+EBUILD pygobject-3.48.2-r1.ebuild 1873 BLAKE2B f5e722ed9e02bbb929be362491a1087a13f7ffda3a279446dc9c45eb77059f61b99b57360b61f06a7b07c93de6c39dc58fc6efd3d655704fc97ee9e370e943d2 SHA512 dd1f453fcdb881363a362c34e27a635d57534006349fd27b0617ee132929b671459fa02caed498187bd56b0e4be4c29dff7a0cf482aab99a3a69eb480c7a29d3
+EBUILD pygobject-3.48.2.ebuild 1826 BLAKE2B f73be1334e854e3664461245c7d6bba4a3130cf1f60c5063fff5cb08e9b5ddd8d8ea339e5f4fb5407b216b9f2c7d3d7bf94ce03c2eedd1be18c0ebb6b3939eed SHA512 468965d95cd6d2934c493baf6a0fab28ad6d0898325621f5fb2c2cdc1fb0707710f446c7c75d19041b2c3d64639414ec23adfa2e4746fb4fbc9ad5ac6b6e1ba8
 MISC metadata.xml 1398 BLAKE2B 0f89629267eea1f03252ac53ebf6478977301f5edf58024152b7e25cac1bb238241d419241dac72181bc82d0bda4dc281fe490a72967b730df7087300562127c SHA512 49ec255944b9530fe59ba325925713512ca84d71149b988c034d092d4a433c6f7a23822d685180c343a40055bb5c879980996d34a30cae8fddc617707bc1a417
diff --git a/dev-python/pygobject/files/pygobject-3.44.1-py312.patch b/dev-python/pygobject/files/pygobject-3.44.1-py312.patch
deleted file mode 100644
index 331e3bc0a3f8..000000000000
--- a/dev-python/pygobject/files/pygobject-3.44.1-py312.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fe6aedd8eebd92844b873f72e99dc4023316c6f3 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Wed, 7 Jun 2023 22:27:55 +0200
-Subject: [PATCH] tests: fix test_gvalue_flat_array_in_item_marshal_failure for
- Python 3.12
-
-See https://gitlab.gnome.org/GNOME/pygobject/-/issues/582
-
-_PyGI_ERROR_PREFIX() no longer works with 3.12 since we only get normalized
-exceptions in there and can't add a prefix like "Item X: " to the message.
-
-Until we figure out how to add this back for 3.12, align the tests with the
-new behaviour (the new exception notes API would be an option, see the
-linked issue)
----
- tests/test_gi.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_gi.py b/tests/test_gi.py
-index 25a3b659..261d8b2b 100644
---- a/tests/test_gi.py
-+++ b/tests/test_gi.py
-@@ -1573,9 +1573,12 @@ class TestGValue(unittest.TestCase):
-         self.assertRaises(OverflowError, GIMarshallingTests.gvalue_flat_array,
-                           [GLib.MININT - 1, "42", True])
- 
-+        # FIXME: https://gitlab.gnome.org/GNOME/pygobject/-/issues/582#note_1764164
-+        exc_prefix = "Item 0: " if sys.version_info[:2] < (3, 12) else ""
-+
-         with pytest.raises(
-                 OverflowError,
--                match='Item 0: %d not in range %d to %d' % (
-+                match=exc_prefix + '%d not in range %d to %d' % (
-                     GLib.MAXINT + 1, GLib.MININT, GLib.MAXINT)):
-             GIMarshallingTests.gvalue_flat_array([GLib.MAXINT + 1, "42", True])
- 
-@@ -1583,7 +1586,7 @@ class TestGValue(unittest.TestCase):
- 
-         with pytest.raises(
-                 OverflowError,
--                match='Item 0: %d not in range %d to %d' % (
-+                match=exc_prefix + '%d not in range %d to %d' % (
-                     GLib.MAXUINT64 * 2, min_, max_)):
-             GIMarshallingTests.gvalue_flat_array([GLib.MAXUINT64 * 2, "42", True])
- 
--- 
-GitLab
-
diff --git a/dev-python/pygobject/files/pygobject-3.48.2-egg-info.patch b/dev-python/pygobject/files/pygobject-3.48.2-egg-info.patch
new file mode 100644
index 000000000000..0da834216f34
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.48.2-egg-info.patch
@@ -0,0 +1,39 @@
+From 2aa50b8841c26eb892f4666508ba72ebb8179f26 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Mon, 25 Mar 2024 19:21:21 +0000
+Subject: [PATCH] Replace non-standard .egg-info file
+
+Installing a .dist-info directory containing just METADATA is compliant:
+
+https://packaging.python.org/en/latest/specifications/recording-installed-packages/#the-dist-info-directory
+---
+ PKG-INFO.in => METADATA.in | 0
+ meson.build                | 6 +++---
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ rename PKG-INFO.in => METADATA.in (100%)
+
+diff --git a/PKG-INFO.in b/METADATA.in
+similarity index 100%
+rename from PKG-INFO.in
+rename to METADATA.in
+diff --git a/meson.build b/meson.build
+index b8d69c3a..32204ad5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -194,10 +194,10 @@ if not for_wheel
+ 
+   pkginfo_conf = configuration_data()
+   pkginfo_conf.set('VERSION', py_version)
+-  configure_file(input : 'PKG-INFO.in',
+-  output : 'PyGObject-@0@.egg-info'.format(py_version),
++  configure_file(input : 'METADATA.in',
++  output : 'METADATA',
+   configuration : pkginfo_conf,
+-  install_dir : python.get_install_dir(pure : false))
++  install_dir : python.get_install_dir(pure : false) / 'PyGObject-@0@.dist-info'.format(py_version))
+ endif
+ 
+ pygobject_dep = declare_dependency(
+-- 
+GitLab
+
diff --git a/dev-python/pygobject/pygobject-3.44.1.ebuild b/dev-python/pygobject/pygobject-3.48.2-r1.ebuild
index 713c63dc4584..08a08ac159f8 100644
--- a/dev-python/pygobject/pygobject-3.44.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.48.2-r1.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{11..13} pypy3 )
 
 inherit gnome.org meson virtualx xdg distutils-r1
 
 DESCRIPTION="Python bindings for GObject Introspection"
 HOMEPAGE="
-	https://pygobject.readthedocs.io/
+	https://pygobject.gnome.org/
 	https://gitlab.gnome.org/GNOME/pygobject/
 "
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/gobject-introspection-1.64:=
 	dev-libs/libffi:=
 	cairo? (
 		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
@@ -44,11 +44,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# fix test failure on py3.12
-	# https://gitlab.gnome.org/GNOME/pygobject/-/commit/fe6aedd8eebd92844b873f72e99dc4023316c6f3
-	"${FILESDIR}/${P}-py312.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-egg-info.patch" )
 
 python_configure() {
 	local emesonargs=(
diff --git a/dev-python/pygobject/pygobject-3.48.2.ebuild b/dev-python/pygobject/pygobject-3.48.2.ebuild
new file mode 100644
index 000000000000..8427e19554a5
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.48.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{11..13} pypy3 )
+
+inherit gnome.org meson virtualx xdg distutils-r1
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="
+	https://pygobject.gnome.org/
+	https://gitlab.gnome.org/GNOME/pygobject/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+cairo examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/gobject-introspection-1.64:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=app-accessibility/at-spi2-core-2.46.0[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+python_configure() {
+	local emesonargs=(
+		$(meson_feature cairo pycairo)
+		$(meson_use test tests)
+		-Dpython="${EPYTHON}"
+	)
+	meson_src_configure
+}
+
+python_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+	meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
+}
+
+python_install() {
+	meson_src_install
+	python_optimize
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}