app-emulation/virt-manager: update live

Signed-off-by: Matt Jolly <Matt.Jolly@footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/26922
Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 26 insertions, 24 deletions

diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index b596c743f947..1957dacecac0 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_SINGLE_IMPL=1
 
 DISTUTILS_USE_SETUPTOOLS=no
@@ -27,31 +27,35 @@ SLOT="0"
 IUSE="gtk policykit sasl"
 
 RDEPEND="${PYTHON_DEPS}
+	gtk? (
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
+		gnome-base/dconf
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		policykit? ( sys-auth/polkit[introspection] )
+		sys-apps/dbus[X]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/gtksourceview:4[introspection]
+		x11-libs/vte:2.91[introspection]
+	)
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	$(python_gen_cond_dep '
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
 		dev-libs/libxml2[python,${PYTHON_USEDEP}]
 		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
 	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
-	gtk? (
-		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
-		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:4[introspection]
-		x11-libs/vte:2.91[introspection]
-		policykit? ( sys-auth/polkit[introspection] )
-	)"
+	"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-python/docutils"
 
 DOCS=( README.md NEWS.md )
 
+# Doesn't seem to play nicely in a sandboxed environment.
+RESTRICT="test"
+
 distutils_enable_tests pytest
 
 python_configure() {
@@ -63,7 +67,7 @@ python_install() {
 }
 
 src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+	local DISTUTILS_ARGS=( --no-update-icon-cache --no-compile-schemas )
 	distutils-r1_src_install
 }
 
@@ -71,21 +75,19 @@ pkg_preinst() {
 	if use gtk; then
 		gnome2_pkg_preinst
 
-		cd "${ED}"
-		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+		cd "${ED}" || die
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null || die)
 	else
-		rm -rf "${ED}/usr/share/virt-manager/virtManager"
-		rm -f "${ED}/usr/share/virt-manager/virt-manager"
-		rm -rf "${ED}/usr/share/virt-manager/ui/"
-		rm -rf "${ED}/usr/share/virt-manager/icons/"
-		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
-		rm -rf "${ED}/usr/share/icons/"
-		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
-		rm -rf "${ED}/usr/bin/virt-manager"
+		rm -r "${ED}/usr/share/virt-manager/ui/" || die
+		rm -r "${ED}/usr/share/virt-manager/icons/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm -r "${ED}/usr/share/applications/virt-manager.desktop" || die
+		rm -r "${ED}/usr/bin/virt-manager" || die
 	fi
 }
 
 pkg_postinst() {
 	use gtk && gnome2_pkg_postinst
 	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
+	optfeature "QEMU host support" app-emulation/qemu[usbredir,spice]
 }