From 0af193126b0874fc5e7f76addb8fb81b7bfcd0e7 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sping@gentoo.org>
Date: Sun, 3 Dec 2023 16:42:01 +0100
Subject: x11-misc/safeeyes: Fix support for Python 3.12

Closes: https://bugs.gentoo.org/919099
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
---
 x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch | 34 ++++++++++++++++
 x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild         |  2 +-
 x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild         | 46 ++++++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch
 create mode 100644 x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild

diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch
new file mode 100644
index 000000000000..93430da89b88
--- /dev/null
+++ b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch
@@ -0,0 +1,34 @@
+From 043d9c5018431b3b41cc2bcfacdaaa7f0db1563c Mon Sep 17 00:00:00 2001
+From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
+Date: Thu, 9 Nov 2023 12:14:13 -0400
+Subject: [PATCH] Fix with python3.12
+
+imp is deprecated in 3.4 and removed in 3.12. this caused safe eyes to
+break on upgrading to fedora 39
+
+Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
+---
+ safeeyes/utility.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/safeeyes/utility.py b/safeeyes/utility.py
+index e145d4d..3976140 100644
+--- a/safeeyes/utility.py
++++ b/safeeyes/utility.py
+@@ -21,7 +21,6 @@
+ """
+ 
+ import errno
+-import imp
+ import inspect
+ import importlib
+ import json
+@@ -355,7 +354,7 @@ def module_exist(module):
+     Check wther the given Python module exists or not.
+     """
+     try:
+-        imp.find_module(module)
++        importlib.util.find_spec(module)
+         return True
+     except ImportError:
+         return False
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
index 02c1bee35ae8..c6d102ef6476 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="tk"  # for site-packages/Xlib/ext/randr.py
 DISTUTILS_USE_PEP517=setuptools
 
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild
new file mode 100644
index 000000000000..307103b60daf
--- /dev/null
+++ b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE="tk"  # for site-packages/Xlib/ext/randr.py
+DISTUTILS_USE_PEP517=setuptools
+
+inherit xdg distutils-r1 pypi
+
+DESCRIPTION="Linux alternative to EyeLeo"
+HOMEPAGE="https://github.com/slgobinath/SafeEyes"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py312.patch
+)
+
+RDEPEND="
+	dev-libs/libayatana-appindicator
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	media-sound/alsa-utils
+	x11-apps/xprop
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-misc/xprintidle
+	"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
-- 
cgit v1.2.3-65-gdbad