gentoo auto-resync : 10:06:2024 - 00:08:04

4 files changed, 21 insertions, 93 deletions

diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 8fa4eac877da..cf90a0e146b5 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,7 +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 dfa896cd9dc0007a43b99801bcffea0fcfa28f8a11cd67741627671bb9cceda8f74593b3915c2b9920be3b24fdcbb0ddae7cb0754f00a12eb92302e7d0a8a7dd SHA512 b3746e14c3db875f7ad785f69d5eafd99b64043d2437c0df2093a031ef964ee531fd9f9524ebb10d359a618e9e3b4103f9aaaaf4a7ad1fb8f59b4afba2e9c36c
-EBUILD safeeyes-2.1.6-r2.ebuild 1019 BLAKE2B 24307618902eaeb06aa0adfd42a46be2f7cd94119e865d3b4049adb76e6765a69d0e924150e10f14e95f0469d5d7e9a4f9993351a7a50f3986b08a6ad1f1685f SHA512 7ac6b529cc8219e0576037a369e297dc01d677ba7ccaa29fe8a919526e250fd0f04a71195c9a84f0c78b2b42f883aa80f525c0888c7a815b1375483afa28734c
+DIST safeeyes-2.1.8.tar.gz 288991 BLAKE2B 53fa71171c42679f7241a13b5542855c542c020814a4ec9e9c7480163bc2179e93787fb87291999815f900d5dea3522f5de8e35e85b714d3cb1cc4e24bad5638 SHA512 df3192ee751510449a0ee8946c8e59daff3dc5b4ef95a2f5563cc82834fbe8d3de52f39be2e0c26c13db7ac3d115ef1de63184ec8d069b99f411f4d60e9b5139
 EBUILD safeeyes-2.1.6-r3.ebuild 1510 BLAKE2B 60436c6dbe9219d0cb5ae21954960e3de0937a19b5de421a0cb777036891b1d602fea774d0531d14a65159665ecef9b2a6d8230fd4b760c590654f89a77240e4 SHA512 5cec71ed3b05454d28a8ffd78889ef1d4f877b3ce2327f1c8b20b056d6ab184e804407f3835e2f9fed965e0ec0f0f69b8bbce8534e3add17537589b2cc62fc41
-EBUILD safeeyes-2.1.6.ebuild 982 BLAKE2B 0123c6f56dcb8d3b924302cb5b0721e98876fb77d369d454f17ad4de298841fc30610401020ea8df45bac2a34da349148aa04c414ab3e6fd46a238cf50230286 SHA512 3c70aaff2379eab803973356e1510fc8076d9efb790b9efb837377e5ce74d09a409ab47eb05e9a2fdfb95a14fd63d98f7a697d608a9e4fad0a00a4785a06b41c
+EBUILD safeeyes-2.1.8.ebuild 1465 BLAKE2B 1bc5ecef32af8f1ed838060df592c8de6dd602858dd0dc368d73d2b99874a3d177ee97c872306b2918a82f2765fda5398e3e4a9fdb382ba1fc62789f423295ec SHA512 0c1921df7e62f9d6a60709a17a4d572ae204bf06252c8ad164546a4d3ec9260616125ae79911797bd6749a826815cd2fee3d1196d09fdd9cc3ff29350cfc6277
 MISC metadata.xml 347 BLAKE2B eda163f3ff13421872558f176120fc2fa5488afa1c9e2b2bd1c3aae6bf76e4e73758f35ba2af529beaf73d5677970ffe6319e8db22279c5eb7885f9f135e9243 SHA512 c09ce25d4d00dc7d322ab1505feb17b0bdec7aa1ec9e4a847705889ec38b76b03758d0a9bf1fc01fd6131d278850ae38462256ab8c968f183523e48dc2692aca
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
deleted file mode 100644
index c6d102ef6476..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-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
-}
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6.ebuild
deleted file mode 100644
index 5aca9341d36c..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.1.6.ebuild
+++ /dev/null
@@ -1,43 +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=""
-
-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
-}
diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild b/x11-misc/safeeyes/safeeyes-2.1.8.ebuild
index 307103b60daf..cd7e15330da3 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,10 +16,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-py312.patch
-)
-
 RDEPEND="
 	dev-libs/libayatana-appindicator
 	dev-python/Babel[${PYTHON_USEDEP}]
@@ -35,6 +31,24 @@ RDEPEND="
 	x11-misc/xprintidle
 	"
 
+python_install() {
+	distutils-r1_python_install
+
+	# Workaround for https://bugs.gentoo.org/926816
+	# Files were misplaced and also duplicate across Python slots.
+	local misplaced_usr="${D}/usr/lib/${EPYTHON}/site-packages/usr"
+	local i
+	for i in applications icons ; do
+		local source="${misplaced_usr}/share/${i}"
+		local target="${D}/usr/share/${i}"
+		if [[ ! -d "${target}" ]]; then
+			dodir /usr/share/
+			mv "${source}" "${target}" || die
+		fi
+	done
+	rm -R "${misplaced_usr}" || die
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update