[gentoo-commits] repo/gentoo:master commit in: x11-misc/safeeyes/files/, x11-misc/safeeyes/

[Sebastian Pipping]

commit: 0af193126b0874fc5e7f76addb8fb81b7bfcd0e7
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Dec  3 15:42:01 2023 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Dec  3 15:57:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af19312

x11-misc/safeeyes: Fix support for Python 3.12

Closes: https://bugs.gentoo.org/919099
Signed-off-by: Sebastian Pipping  gentoo.org>

 x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch | 34 ++
 x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild |  2 +-
 ...es-2.1.6-r1.ebuild => safeeyes-2.1.6-r2.ebuild} |  4 +++
 3 files changed, 39 insertions(+), 1 deletion(-)

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 ..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 
+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 
+---
+ 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-r1.ebuild 
b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild
similarity index 95%
copy from x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
copy to x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild
index 02c1bee35ae8..307103b60daf 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild
@@ -16,6 +16,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-py312.patch
+)
+
 RDEPEND="
dev-libs/libayatana-appindicator
dev-python/Babel[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-misc/safeeyes/files/, x11-misc/safeeyes/

[Sebastian Pipping]

commit: 86e45683936ea303446135948c74cfa77a8f1226
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Nov  5 22:06:23 2023 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Nov  5 22:06:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e45683

x11-misc/safeeyes: Drop old

Signed-off-by: Sebastian Pipping  gentoo.org>

 x11-misc/safeeyes/Manifest |  1 -
 .../files/safeeyes-2.1.5-python-3.11.patch | 25 
 x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild | 47 --
 3 files changed, 73 deletions(-)

diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 6b686165b96b..4fcd5e9d7940 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,2 +1 @@
-DIST safeeyes-2.1.5.tar.gz 284690 BLAKE2B 
deedf39bc0a69ee70a692061c96e0ea5ce6aeb09513d7469710d25b8660eaed854b3ee711de4702f839dbfb1f04aee84cb05ebc24d4567fc2b56c04e319f5c63
 SHA512 
0e4ed1d9f4473b45f6f5d4a74ba4817fca08199072fe937fd3b7ceed1ef543729c618e672198cf4dfeba8ed896b24779ca725f2f2c98bf1c9cdf1a8e9c147dc8
 DIST safeeyes-2.1.6.tar.gz 286359 BLAKE2B 
a5e4b4d680d455f2ae9494705f1e4508341802f4826b2d11f5407eed4074f0eab45066a3741745dd164b47e26a2dbf2a393945bffef0f747cbebd5f87b3b1961
 SHA512 
6476284ed1d8cdde77f10b3fe962a5d9d5ead944b0418f797e375cc67affa6807d858279cf4a1189585b7688dbe983fc6b90c917e0e55a2a11ebfdc56b44ca93

diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch 
b/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch
deleted file mode 100644
index e494dfc1a2ce..
--- a/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1fabfb9eddc2b67d174dffba0e46ecb4fb4dec71 Mon Sep 17 00:00:00 2001
-From: tibequadorian 
-Date: Tue, 24 Jan 2023 18:39:49 +0100
-Subject: [PATCH] utility.py: Fix getargspec error with python 3.11
-

- safeeyes/utility.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/safeeyes/utility.py b/safeeyes/utility.py
-index bf2dede..7e08735 100644
 a/safeeyes/utility.py
-+++ b/safeeyes/utility.py
-@@ -666,7 +666,7 @@ def has_method(module, method_name, no_of_args=0):
- Check whether the given function is defined in the module or not.
- """
- if hasattr(module, method_name):
--if len(inspect.getargspec(getattr(module, method_name)).args) == 
no_of_args:
-+if len(inspect.getfullargspec(getattr(module, method_name)).args) == 
no_of_args:
- return True
- return False
- 
--- 
-2.39.1
-

diff --git a/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild 
b/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild
deleted file mode 100644
index c5cb4ebcd177..
--- a/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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"
-IUSE=""
-
-PATCHES=(
-   "${FILESDIR}"/${P}-python-3.11.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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/safeeyes/files/, x11-misc/safeeyes/

[Sebastian Pipping]

commit: 0b8e113a954a44ec1f32eebcc74e2db818c7847d
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Tue Jan 24 17:16:56 2023 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Jan 24 17:53:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8e113a

x11-misc/safeeyes: Fix py311 + switch to dev-libs/libayatana-appindicator

Closes: https://bugs.gentoo.org/891951
Signed-off-by: Sebastian Pipping  gentoo.org>

 .../files/safeeyes-2.1.5-python-3.11.patch | 25 +++
 x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild | 48 ++
 2 files changed, 73 insertions(+)

diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch 
b/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch
new file mode 100644
index ..e494dfc1a2ce
--- /dev/null
+++ b/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch
@@ -0,0 +1,25 @@
+From 1fabfb9eddc2b67d174dffba0e46ecb4fb4dec71 Mon Sep 17 00:00:00 2001
+From: tibequadorian 
+Date: Tue, 24 Jan 2023 18:39:49 +0100
+Subject: [PATCH] utility.py: Fix getargspec error with python 3.11
+
+---
+ safeeyes/utility.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/safeeyes/utility.py b/safeeyes/utility.py
+index bf2dede..7e08735 100644
+--- a/safeeyes/utility.py
 b/safeeyes/utility.py
+@@ -666,7 +666,7 @@ def has_method(module, method_name, no_of_args=0):
+ Check whether the given function is defined in the module or not.
+ """
+ if hasattr(module, method_name):
+-if len(inspect.getargspec(getattr(module, method_name)).args) == 
no_of_args:
++if len(inspect.getfullargspec(getattr(module, method_name)).args) == 
no_of_args:
+ return True
+ return False
+ 
+-- 
+2.39.1
+

diff --git a/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild 
b/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild
new file mode 100644
index ..debfe192fcfa
--- /dev/null
+++ b/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="tk"  # for site-packages/Xlib/ext/randr.py
+DISTUTILS_USE_PEP517=setuptools
+
+inherit xdg distutils-r1
+
+DESCRIPTION="Linux alternative to EyeLeo"
+HOMEPAGE="https://github.com/slgobinath/SafeEyes;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+PATCHES=(
+   "${FILESDIR}"/${P}-python-3.11.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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/safeeyes/files/, x11-misc/safeeyes/

[Sebastian Pipping]

commit: 00ddbcbbeec0caa0aa7b04788baf793da46997a1
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Wed Jan  3 18:57:24 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Wed Jan  3 19:13:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ddbcbb

x11-misc/safeeyes: 2.0.1

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 x11-misc/safeeyes/Manifest |  1 +
 .../safeeyes/files/safeeyes-2.0.1-setup-py.patch   | 37 +++
 x11-misc/safeeyes/safeeyes-2.0.1.ebuild| 55 ++
 3 files changed, 93 insertions(+)

diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index db087e8c3df..94ddd15740b 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,3 +1,4 @@
 DIST safeeyes-1.2.1.tar.gz 137676 BLAKE2B 
f19d4781b14a41aba79ba13a5adc52843111a2ea0056f6505ee08f21a6f16a17e8e89f29f719b114e275c4285dfec9431672dafe1ecfb4c57a974ca34786a263
 SHA512 
a2a31fd1b0e31403a8e2bd938e19b317a5ebcee66ce1fa29d1b00e4ed9f7b78281bfac5fff1486166f4093211c515e5d06577d47251a711e9b92af24c56f6b5c
 DIST safeeyes-1.2.2.tar.gz 146517 BLAKE2B 
6df368e177c54b4221a88b4e01fe484bc0bfad52354976fed70f85f3271dcd7763ee6ed47f4250fae375b86ec26f2fbc93bf0411925666535419cb4080464c04
 SHA512 
3a693bd2976106c8b2e6e131acb1667a52610348c5f0cb6e76e9b1290bf633a0cbfe34632330163dd754df19f600a5781d5b2ef05102194dbcb0de4cc6a9869e
 DIST safeeyes-2.0.0.tar.gz 179036 BLAKE2B 
c35de1fb28076374ea112eae422f0ebeb8e0bdc1fd1060558436e3d4e1194a91df6f6e9f0cbbafa2b5919262f1678b946492305e9163d8a626487b22e8bbb7fc
 SHA512 
b3a655a761fb24b8fee5455d29b2333b8d5b60a7c759a38df0fa1fd608e3a35dccb24a8aeaae87fde5e7cbe1df7569c2bb5897076e1d0cc4d96c98a029249881
+DIST safeeyes-2.0.1.tar.gz 211680 BLAKE2B 
fba6ed8bc3d9e9c4c953e4746c81faf96448b4bf5a15c8008061e596dfcd418d852e5c273a06dae70bdf7f6bc89bd0b142d602208efce8c6c076e04fad908b1d
 SHA512 
77c26fd04d7a5a801bc12be182bb5b60e293b83acad88264b5d267b9a620d8300baf21399257765d7dd9a297cebd3acb256ffc1eff29fb478c22c5f9aa4f0de3

diff --git a/x11-misc/safeeyes/files/safeeyes-2.0.1-setup-py.patch 
b/x11-misc/safeeyes/files/safeeyes-2.0.1-setup-py.patch
new file mode 100644
index 000..777c5d2e5be
--- /dev/null
+++ b/x11-misc/safeeyes/files/safeeyes-2.0.1-setup-py.patch
@@ -0,0 +1,37 @@
+From a3373aa9b0a5bf473357b337f5f0944552831262 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Wed, 3 Jan 2018 19:17:22 +0100
+Subject: [PATCH] Fix start-up crash from broken PyGObject dependency
+
+$ safeeyes
+Traceback (most recent call last):
+  File "/usr/lib/python-exec/python3.5/safeeyes", line 6, in 
+from pkg_resources import load_entry_point
+  [..]
+  File "/usr/lib64/python3.5/site-packages/pkg_resources/__init__.py", line 
870, in resolve
+raise DistributionNotFound(req, requirers)
+pkg_resources.DistributionNotFound: The 'gi' distribution was not found and is 
required by safeeyes
+
+$ python3.5 -c 'import gi; print(gi.__file__)'
+/usr/lib64/python3.5/site-packages/gi/__init__.py
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index e6e4ef1..5dff037 100644
+--- a/setup.py
 b/setup.py
+@@ -6,8 +6,7 @@ import setuptools
+ requires = [
+ 'babel',
+-'dbus',
+-'gi',
+ 'psutil',
++'PyGObject',
+ 'python-xlib'
+ ]
+ 
+-- 
+2.15.0
+

diff --git a/x11-misc/safeeyes/safeeyes-2.0.1.ebuild 
b/x11-misc/safeeyes/safeeyes-2.0.1.ebuild
new file mode 100644
index 000..dfa294d11aa
--- /dev/null
+++ b/x11-misc/safeeyes/safeeyes-2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit gnome2-utils xdg distutils-r1
+
+DESCRIPTION="Linux alternative to EyeLeo"
+HOMEPAGE="https://github.com/slgobinath/SafeEyes;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portaudio"
+
+CDEPEND="${PYTHON_DEPS}"
+DEPEND="${CDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "
+RDEPEND="${CDEPEND}
+   dev-libs/libappindicator:3
+   dev-python/Babel[${PYTHON_USEDEP}]
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   portaudio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/python-xlib[${PYTHON_USEDEP}]
+   x11-apps/xprop
+   x11-misc/xprintidle
+   "
+
+DOCS=(
+   README.md
+)
+
+src_prepare() {
+   eapply "${FILESDIR}"/${P}-setup-py.patch
+   eapply_user
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   xdg_desktop_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   gnome2_icon_cache_update
+}