gentoo resync : 29.12.2022

4 files changed, 3 insertions, 145 deletions

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 2a74d0a7ca70..5975a57f293a 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,6 +1,3 @@
-AUX pygobject-3.42.0-dynamicimporter-py310.patch 2283 BLAKE2B f59cd749cea48343d0bf1c798c1b8d038c763c2cf3afd798030c7befe428427fe30d37c4dcbd5ffe8c9bbca18b3cb04fdae464867262e489075a254c9ac29fc5 SHA512 2ab000c63386eb986cd396e6c51054482d06923f279021d04e9674f16e17cbfea00a8f0750c8cd05d04db0a07a35e5f2739aec7040372b039ae86971e636d96c
-DIST pygobject-3.42.0.tar.xz 557060 BLAKE2B 25c0634dcb713f4059d19ff2efdd67004e1343f49982123686f4df71fc2678583244dab7a22160f42d5361c3e5c6e38bcd8ccaeeafb3e1d885e5d5febaa9dde1 SHA512 2f3e9187cb8dd7ccbf139a58ea348732fc7cb95dbf4bee2ba8f78003a7540d90c0b29153d93f50bf613c2d43f0de0ec8971c61c358d48552e42ce17775a178dd
 DIST pygobject-3.42.1.tar.xz 557904 BLAKE2B 5264c1b187210622548203e0df5089262ea0b3e93d9e46679030b4722e74f1993f200cfe9357c389357902bcdfdb13c8fd9cc9d6efa3b5fa0f730c3b54017fe5 SHA512 b044d395f8334057be632fd56f670ae8405d9fc375bcbd7a0a3b2dcfb8efb06bad45e62e92d2ee5432e503642dba11d6f9bf91f26bf135fa5f9a871657105a18
-EBUILD pygobject-3.42.0.ebuild 1840 BLAKE2B 17e0358b9b7821ff1ff2159b70bcaa417ec4b5925c9714a9b128693e35511a71f358f7db70d950e20024676566dea92c6fd77756a100cfba44738f41e330e931 SHA512 259ad017d2d4a4b81fe8b709832934963f1e5c05224ec5c4761987462a293954e2717d904435fc2ed6cc35488ed9637a1c2c6de402b7350c07f7a46a8315d000
-EBUILD pygobject-3.42.1.ebuild 1787 BLAKE2B 28f6d0b1473fe6a156ba98a1cd9e3311afc71cc5e12c87d1831e905b3e7f586c9cd77dca4226d79466a6e9e7675622aff6b32ca4cd8b7afd9edec3c9cd51ce00 SHA512 0404e16591e87012e01fea6a3b30aab837c603c979385b73745051f9c73b459f0b97340eea5c87b0f13572d675d6c36b3eca6eb26a2aff9237f57ee587a80fd1
+EBUILD pygobject-3.42.1.ebuild 1786 BLAKE2B 8da4bf87d753a965f24204363d4250554fceb822bf55090a401ac643d2bd91491ba6dbf3eef57517cfd684350261dc97e73058bf98656a9c92fc3e0dbd84d592 SHA512 aece28c7d33be016887008111abef907eed8d7746559d0527a8a1ef4c46cfde25a2689f620a7b4d4ed4edae332a07630d3b918ac767440b7c91eb892da4dea53
 MISC metadata.xml 1293 BLAKE2B f47bd4d3e2239697d3684223a8dcfed77c3af429414f6bbbcd6e37d1707d38796fc1ab6ba01402442dbf9cff8d89349888403240ab9dd348083968c61eae5cb8 SHA512 33ad074a03fa3ac7917dc7225218cf8e636776588015c9a9cd9c2274fe77b63a0695f288ff06e0cb94899e5286d11a9746457531df945f8a95fd7e031f601db3
diff --git a/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch b/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch
deleted file mode 100644
index cf292ffbf7c6..000000000000
--- a/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From dea457c0754550e210ab3cca9da8be1ae52d1d31 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 18 May 2021 12:31:51 +0200
-Subject: [PATCH] Implement DynamicImporter.find_spec()
-
-On Python 3.10, the code raised an ImportWarning:
-
-    ImportWarning: DynamicImporter.find_spec() not found; falling back to find_module()
-
-See https://docs.python.org/3.10/whatsnew/3.10.html#deprecated
-
-> Starting in this release, there will be a concerted effort to begin cleaning
-> up old import semantics that were kept for Python 2.7 compatibility.
-> Specifically, find_loader()/find_module() (superseded by find_spec()),
-> load_module() (superseded by exec_module()), module_repr()
-> (which the import system takes care of for you),
-> the __package__ attribute (superseded by __spec__.parent),
-> the __loader__ attribute (superseded by __spec__.loader),
-> and the __cached__ attribute (superseded by __spec__.cached)
-> will slowly be removed (as well as other classes and methods in importlib).
-> ImportWarning and/or DeprecationWarning will be raised as appropriate to help
-> identify code which needs updating during this transition.
-
-Fixes https://gitlab.gnome.org/GNOME/pygobject/-/issues/473
----
- gi/importer.py | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/gi/importer.py b/gi/importer.py
-index 32967974..63788776 100644
---- a/gi/importer.py
-+++ b/gi/importer.py
-@@ -107,15 +107,20 @@ class DynamicImporter(object):
-     def __init__(self, path):
-         self.path = path
- 
--    def find_module(self, fullname, path=None):
-+    def _find_module_check(self, fullname):
-         if not fullname.startswith(self.path):
--            return
-+            return False
- 
-         path, namespace = fullname.rsplit('.', 1)
--        if path != self.path:
--            return
-+        return path == self.path
-+
-+    def find_spec(self, fullname, path=None, target=None):
-+        if self._find_module_check(fullname):
-+            return importlib.util.spec_from_loader(fullname, self)
- 
--        return self
-+    def find_module(self, fullname, path=None):
-+        if self._find_module_check(fullname):
-+            return self
- 
-     def load_module(self, fullname):
-         if fullname in sys.modules:
--- 
-2.32.0
-
diff --git a/dev-python/pygobject/pygobject-3.42.0.ebuild b/dev-python/pygobject/pygobject-3.42.0.ebuild
deleted file mode 100644
index d16ca40b8024..000000000000
--- a/dev-python/pygobject/pygobject-3.42.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dynamicimporter-py310.patch
-)
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_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
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.42.1.ebuild b/dev-python/pygobject/pygobject-3.42.1.ebuild
index 5a3a9f1a993c..95db0a28fc86 100644
--- a/dev-python/pygobject/pygobject-3.42.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org meson python-r1 virtualx xdg
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"