x11-misc/safeeyes: EAPI 7 + de-warn PythonCompatUpdate

Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-3.0.0, Repoman-2.3.23

4 files changed, 7 insertions, 111 deletions

diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 9aa91080cf18..5ad0f9486da4 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,3 +1 @@
-DIST safeeyes-2.0.8.1.tar.gz 314379 BLAKE2B 9a54dfcda3027ecb12261b5e90f5526c4011ddc07bcaa8f80357b60738a5a03673136c5597e0f1414894b548d10a52da13f7cac4bd418c0534c341bcf3b5397a SHA512 06b53d6baad479e4143ae65cc37d01367ff73875083817511903692f493f01f5704a1f37ac95c4ec4aaa66040ec0aa1424e6a76fbea0676584fd531c1547b0a7
-DIST safeeyes-2.0.8.tar.gz 304438 BLAKE2B 5f6b36ae0d214e33035d1a3f7856c2eacd8407b2586365f7c914d69a5744a4d1488f5bcbc1d1c7112b9f237ccdbfa7839c426048e88d2e19e56cf550da33ecfa SHA512 6e7669d9ee6b2167c23307108544b3a3b4a4161fe819569fc7920a7e24af94701b053a2e147f83ce0300a0112e2a66d500055fc722eba89208b6c0cd86b49f38
 DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild b/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
deleted file mode 100644
index 583b24353a25..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-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=""
-
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}
-	dev-libs/libappindicator:3
-	dev-python/Babel[${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-misc/xprintidle
-	"
-
-DOCS=(
-	README.md
-)
-
-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
-}
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9-r1.ebuild
index 583b24353a25..fe34e0ec4707 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.9-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-inherit gnome2-utils xdg distutils-r1
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
 HOMEPAGE="https://github.com/slgobinath/SafeEyes"
@@ -35,16 +37,12 @@ DOCS=(
 	README.md
 )
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
deleted file mode 100644
index 583b24353a25..000000000000
--- a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-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=""
-
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	>=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
-	"
-RDEPEND="${CDEPEND}
-	dev-libs/libappindicator:3
-	dev-python/Babel[${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-misc/xprintidle
-	"
-
-DOCS=(
-	README.md
-)
-
-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
-}