gentoo auto-resync : 03:12:2023 - 16:59:43

4 files changed, 84 insertions, 2 deletions

diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 877a09d5db5f..7198dcea7de7 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,4 +1,6 @@
+AUX safeeyes-2.1.6-py312.patch 934 BLAKE2B f071929938ec8cf8511099e11844ee517a86c7b5abcac5cbee9f3722718b58ea61700ee95ba67d607dae7b8d833c8ff26cb00a7fcf4b7e7aef477bac87015f40 SHA512 684082d2d6a21d2ec64081e765d76e47788ba9ee56650435e2a5ec86a89784e912f09001099408d4fc4d2694decd20b2425ef03f1bfa41c47bb8fcd711b1d2d7
 DIST safeeyes-2.1.6.tar.gz 286359 BLAKE2B a5e4b4d680d455f2ae9494705f1e4508341802f4826b2d11f5407eed4074f0eab45066a3741745dd164b47e26a2dbf2a393945bffef0f747cbebd5f87b3b1961 SHA512 6476284ed1d8cdde77f10b3fe962a5d9d5ead944b0418f797e375cc67affa6807d858279cf4a1189585b7688dbe983fc6b90c917e0e55a2a11ebfdc56b44ca93
-EBUILD safeeyes-2.1.6-r1.ebuild 974 BLAKE2B fd6a79a77610ce1469917df135d64dcd55e33e67bf452a382bdc8a73ada48f384c31588b036770d6bd98c373b8f118658a0d3cca4aba37395be71a6fa4641d00 SHA512 1e0e6d320ae84c52c8df4194bd3d8fdc5df61e7f7d1367c4585501e3494e8c8061761a4d388b799e7367d0fe65e679a5b9ad8b18928ba2e604aac24b9664d21b
+EBUILD safeeyes-2.1.6-r1.ebuild 974 BLAKE2B dfa896cd9dc0007a43b99801bcffea0fcfa28f8a11cd67741627671bb9cceda8f74593b3915c2b9920be3b24fdcbb0ddae7cb0754f00a12eb92302e7d0a8a7dd SHA512 b3746e14c3db875f7ad785f69d5eafd99b64043d2437c0df2093a031ef964ee531fd9f9524ebb10d359a618e9e3b4103f9aaaaf4a7ad1fb8f59b4afba2e9c36c
+EBUILD safeeyes-2.1.6-r2.ebuild 1019 BLAKE2B 24307618902eaeb06aa0adfd42a46be2f7cd94119e865d3b4049adb76e6765a69d0e924150e10f14e95f0469d5d7e9a4f9993351a7a50f3986b08a6ad1f1685f SHA512 7ac6b529cc8219e0576037a369e297dc01d677ba7ccaa29fe8a919526e250fd0f04a71195c9a84f0c78b2b42f883aa80f525c0888c7a815b1375483afa28734c
 EBUILD safeeyes-2.1.6.ebuild 982 BLAKE2B 0123c6f56dcb8d3b924302cb5b0721e98876fb77d369d454f17ad4de298841fc30610401020ea8df45bac2a34da349148aa04c414ab3e6fd46a238cf50230286 SHA512 3c70aaff2379eab803973356e1510fc8076d9efb790b9efb837377e5ce74d09a409ab47eb05e9a2fdfb95a14fd63d98f7a697d608a9e4fad0a00a4785a06b41c
 MISC metadata.xml 347 BLAKE2B eda163f3ff13421872558f176120fc2fa5488afa1c9e2b2bd1c3aae6bf76e4e73758f35ba2af529beaf73d5677970ffe6319e8db22279c5eb7885f9f135e9243 SHA512 c09ce25d4d00dc7d322ab1505feb17b0bdec7aa1ec9e4a847705889ec38b76b03758d0a9bf1fc01fd6131d278850ae38462256ab8c968f183523e48dc2692aca
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
+}