5 files changed, 141 insertions, 1 deletions
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 59a8d3908f1e..8d2648b6328a 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 47a681d9d4f9..01a304faeb6e 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,3 +1,5 @@
+AUX accerciser-3.42.0-imp-module.patch 3436 BLAKE2B 71577620a4e81ab0d9b2bd19a3a8cdd3f411822de9ea5fbc08f1aae53bcda0aaa209ecd9a7303320b6d3bd7614575115dd25189589e46ddf04658fa384135416 SHA512 0d7830eb1689b5d31cb955ff5c98a15633deb023e0dd26b431406d8abd5c3f882232ca46cca3f29fbfbfc4671ac4e41e7ee36bf9e621a2780327055f33b97ec0
 DIST accerciser-3.42.0.tar.xz 1999644 BLAKE2B 190f37ab94aba2dd1f16594242426a33bac366b89eb284c739c02a96cf0330ccb562237079d79ade5b729c5e38facbb542af2ace195a5d9b6d1c68a5005ba653 SHA512 65c3819c80c9ec3c8728963572a2c7bb4575782abde8ee34e3b7fa31217ef0e8106a7702c5b5a32b123ccb84b357984844a6d4aee75bf7e6157f3d63588224da
+EBUILD accerciser-3.42.0-r1.ebuild 1292 BLAKE2B daf93aa80fe6fbd1bd17b34d1768436e557f9856d5dde41ebaa871048135bc45201a635c09c42358a1a5ed9ab6de3bdf1c5e7155a99f2c6d3c381dd3ace9dc54 SHA512 e54ca9f38deb1d32aff13b18b48b59df3ea1440188c92d1e0209f96307d66eab54f19adc91811fabd6073aa3fead9d558e30d1cccdca6ccb6e78fa05d2c245f9
 EBUILD accerciser-3.42.0.ebuild 1196 BLAKE2B 1584ea48eb5a4dca3f5775756ce13d31e4bf455c35a67faac66a254c5472f1889308c923a9c6349b545faf0124671c30ea14a59e596f74a6d467507a2fda2b14 SHA512 30bc75f79c0f9df2200d67acbad93f48d13101db7c619b0e050bf31f2296ddbc5f25b7441a53ca848b9a7057657f89483ecf006e069ec740f9d610101f6c1784
-MISC metadata.xml 836 BLAKE2B c267ec04334d6652d6e402d58cc8b3d5d9665c83fa127ba3a168ff7437dd8aa60f699196c71be10e0a63bd52931a0b157fb92ac65ef8a601331ceb8404560d7f SHA512 ebc2a15a8a2f0c107a0c24261806a06efc63a018e94e1ff5e9e67b37c73cf80830f79084627559e743e7267c4a0cddc90ab7a852881664c6324d00479c6fb425
+MISC metadata.xml 861 BLAKE2B 2c5c372e20fb030b3ba1a5abd16b18ae1098dfaddee8752319f65bed04c4612be3a0a600984ae1bce0a2237d5e7f4713731d04f101de8447d5a9a3c911afdbf2 SHA512 e51a453ff6cb0e1640f14ab418433d306d8c2d5dde4e0523aa24dcc88e63cafe7fec02652ae0598e6f7d4a61c1212a3f5362d31266b90b7524584d99bf59caba
diff --git a/app-accessibility/accerciser/accerciser-3.42.0-r1.ebuild b/app-accessibility/accerciser/accerciser-3.42.0-r1.ebuild
new file mode 100644
index 000000000000..3fa4dbfdb71f
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.42.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser https://gitlab.gnome.org/GNOME/accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.5.2:2
+	>=x11-libs/gtk+-3.24.0:3[introspection]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+	')
+
+	dev-libs/atk[introspection]
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection:=
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Port from imp to importlib (from 'master')
+	"${FILESDIR}/${P}-imp-module.patch"
+)
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}
diff --git a/app-accessibility/accerciser/files/accerciser-3.42.0-imp-module.patch b/app-accessibility/accerciser/files/accerciser-3.42.0-imp-module.patch
new file mode 100644
index 000000000000..abcba67386c8
--- /dev/null
+++ b/app-accessibility/accerciser/files/accerciser-3.42.0-imp-module.patch
@@ -0,0 +1,83 @@
+diff '--color=auto' -ur accerciser-3.42.0.orig/plugins/validate.py accerciser-3.42.0/plugins/validate.py
+--- accerciser-3.42.0.orig/plugins/validate.py	2024-07-15 20:46:50.173168139 +0200
++++ accerciser-3.42.0/plugins/validate.py	2024-07-15 20:50:07.974258909 +0200
+@@ -20,7 +20,7 @@
+ import traceback
+ import sys
+ import glob
+-import imp
++import importlib
+ import webbrowser
+ from accerciser.plugin import ViewportPlugin
+ from accerciser.i18n import _, N_, DOMAIN
+@@ -68,16 +68,18 @@
+     '''
+     for path in [USER_SCHEMA_PATH, SYS_SCHEMA_PATH]:
+       for fn in glob.glob(os.path.join(path, '*.py')):
+-        module = os.path.basename(fn)[:-3]
+-        params = imp.find_module(module, [path])
+-        schema = imp.load_module(module, *params)
++        module_name = os.path.basename(fn)[:-3]
++        spec = importlib.util.spec_from_file_location(module_name, fn)
++        module = importlib.util.module_from_spec(spec)
++        spec.loader.exec_module(module)
++
+         try:
+           # try to get descriptive fields from the module
+-          SCHEMA_METADATA[module] = schema.__metadata__
++          SCHEMA_METADATA[module_name] = module.__metadata__
+         except AttributeError:
+           # default to usinf file name as description
+-          SCHEMA_METADATA[module] = {'name' : module,
+-                                        'description' : _('No description')}
++          SCHEMA_METADATA[module_name] = {'name' : module,
++                                          'description' : _('No description')}
+       
+   @staticmethod
+   def getValidators(name):
+diff '--color=auto' -ur accerciser-3.42.0.orig/pyreqs.py accerciser-3.42.0/pyreqs.py
+--- accerciser-3.42.0.orig/pyreqs.py	2024-07-15 20:46:50.170168156 +0200
++++ accerciser-3.42.0/pyreqs.py	2024-07-15 20:50:27.235354799 +0200
+@@ -11,7 +11,7 @@
+ this distribution, and is available at 
+ U{http://www.opensource.org/licenses/bsd-license.php}
+ '''
+-import sys, os, imp
++import sys, os
+ 
+ PYGTK_REQ = '2.0'
+ PYATSPI_REQ = (2, 23, 3)
+Sólo en accerciser-3.42.0: pyreqs.py.orig
+diff '--color=auto' -ur accerciser-3.42.0.orig/src/lib/accerciser/plugin/plugin_manager.py accerciser-3.42.0/src/lib/accerciser/plugin/plugin_manager.py
+--- accerciser-3.42.0.orig/src/lib/accerciser/plugin/plugin_manager.py	2024-07-15 20:46:50.169168161 +0200
++++ accerciser-3.42.0/src/lib/accerciser/plugin/plugin_manager.py	2024-07-15 20:47:28.027960768 +0200
+@@ -23,7 +23,7 @@
+ from .message import MessageManager
+ import os
+ import sys
+-import imp
++import importlib
+ import traceback
+ from accerciser.i18n import _, N_, C_
+ 
+@@ -136,8 +136,7 @@
+     '''
+     sys.path.insert(0, plugin_dir)
+     try:
+-      params = imp.find_module(plugin_fn, [plugin_dir])
+-      plugin = imp.load_module(plugin_fn, *params)
++      plugin = importlib.import_module(plugin_fn)
+       plugin_locals = plugin.__dict__
+     except Exception as e:
+       self.message_manager.newModuleError(plugin_fn, plugin_dir,
+diff '--color=auto' -ur accerciser-3.42.0.orig/src/lib/accerciser/plugin/view.py accerciser-3.42.0/src/lib/accerciser/plugin/view.py
+--- accerciser-3.42.0.orig/src/lib/accerciser/plugin/view.py	2024-07-15 20:46:50.170168156 +0200
++++ accerciser-3.42.0/src/lib/accerciser/plugin/view.py	2024-07-15 20:47:28.028960763 +0200
+@@ -20,7 +20,6 @@
+ from .message import MessageManager
+ import os
+ import sys
+-import imp
+ from accerciser.i18n import _, N_
+ import gc
+ from accerciser import ui_manager
diff --git a/app-accessibility/accerciser/metadata.xml b/app-accessibility/accerciser/metadata.xml
index 3d77751efc4b..8596c0d00151 100644
--- a/app-accessibility/accerciser/metadata.xml
+++ b/app-accessibility/accerciser/metadata.xml
@@ -5,6 +5,7 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription lang="en">
   Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information.