gentoo auto-resync : 20:08:2022 - 02:37:51

3 files changed, 153 insertions, 32 deletions

diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 1fc885f5444d..4cc3a18cc573 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,7 +1,9 @@
 AUX virt-manager-4.0.0-setuptools-61-fix.patch 993 BLAKE2B e129b16cdfb1fb819f4cc8e99b67c28a259de92e62254ddd6d2fd4920ab1713cfb3329d219d692a37b963eff6dedfef36e5e5763ec25d7ce736767d17c52966e SHA512 eb0ec5d9cd73ce35b0c0cc75413e607bb57854a0430ef509acbc438d829ba84dc06441f8b333133c2de7cd423b3110faa0b5012eeff72e594905376b716265fa
 DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
 DIST virt-manager-4.0.0.tar.gz 3096236 BLAKE2B cf6ae282c6a351aab832a06387bf9daf9093c8cce3688cf0597f33d037db875638429a5320ffe28d8d860c83484ba5d6a02a8dc758c98914fa2af483552dede8 SHA512 115dc3feb499bb2f1f6df537bffe150d23b9b568fe8047d43577a138ff9b9180b10259dde3476136cdc85750576da1104e81a8c2f5761b4f2a89852467761f81
+DIST virt-manager-4.1.0.tar.gz 3151412 BLAKE2B 1b4203be81bd7b82251225d691a4d9068f268e610f049bcadb96de5b539e964ca0b001f22f06ddd8266b58b079f60046f6d11942a1e4eadbc43f0607c46bbddd SHA512 725cb5bcbaebaafae417f95deffb4243ccdad769668cba6e1235f4607e2b29dbd099d2a9a3885981158f53ea854dd71cc29ed9d7557b2791161c13d34f2ef883
 EBUILD virt-manager-3.2.0-r1.ebuild 2566 BLAKE2B 9fdea4cfaa4d6cbe5f9b9000695ebd02c8e2c4d9d4ed0222a90690f977f72de63f997187295b13c110242b016003bf693ac032e2edc59eea2b3ea6fd81436336 SHA512 72f75dd06013f473c8620e726a49dde64b20137d1020f7bab0933c3b79ec515eeeae50b592661eba25a0ad57995b06c780dde7b49fe0407141e8cc8a1c0f25e7
 EBUILD virt-manager-4.0.0.ebuild 2607 BLAKE2B 52cebf620855872635d2b0dbbe971093ccb6faa575c42c005dc272f1755c060ff92eea9b120dcc89a603314f8c31be43b544e1456590c6a98371c11e2063eee6 SHA512 531e2c6014f6267b300c47c44aac89c8dcab39eb6244d1e86fa7ca47d37a3a8e869badc481a407e0662a129b96e3b12cce6624e5b510e9271d3f31e1c42cbc44
-EBUILD virt-manager-9999.ebuild 2524 BLAKE2B 2ec7855cb1f40cbcfe9fc44268a67f232b363afb02beae4450360863721cb08cbc326df90464bc1541585d536dc4b8f699044788c84101cd8249b7ed956bfccf SHA512 8f07683cb85c6ccf57c76ab1451e5beee44dbb8bae4f4a7416e73359d544f5a191e0fcc45da7ba567db87a18c7b3d322a537cc5fd0f4f0ed5d7ffd79db873849
+EBUILD virt-manager-4.1.0.ebuild 2642 BLAKE2B 7db78a0d314e205b6460383643e4997ae0de26a998b5d41dc7346dd35490622669afc5cb3c2ef86ca7cb27c7ea4707dc071213ffb5777e68ae7df77b18fb6759 SHA512 3b7427b36cbf9c7b6237734fbac63852cbe85afb0e6c738db48aa25fe7b1854065979c88e991f15b66b0b13cb7a0b25ab59a39c4a9bb9dfcdff5246d6f09fc40
+EBUILD virt-manager-9999.ebuild 2642 BLAKE2B 7db78a0d314e205b6460383643e4997ae0de26a998b5d41dc7346dd35490622669afc5cb3c2ef86ca7cb27c7ea4707dc071213ffb5777e68ae7df77b18fb6759 SHA512 3b7427b36cbf9c7b6237734fbac63852cbe85afb0e6c738db48aa25fe7b1854065979c88e991f15b66b0b13cb7a0b25ab59a39c4a9bb9dfcdff5246d6f09fc40
 MISC metadata.xml 717 BLAKE2B 931cc0f16850272e3d61e4c3421768bd01fd98891d1049d540c36dfcc1cd3872c158796edf33479005fdf07fe449d251ef55562a832db8827e757202ed1b046e SHA512 e40d93e6febcbb48ea6178986736721a5c45bc92073a9108179fd437bb303ba1b6bf0adb6053e36f877b660c413404ef877aefe4d3ef2ec124d6b6cc808a411d
diff --git a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
new file mode 100644
index 000000000000..b2ec505d5c37
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit gnome2 distutils-r1 optfeature
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+	EGIT_BRANCH="main"
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gui policykit sasl"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-cdr/cdrtools
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	>=sys-libs/libosinfo-0.2.10[introspection]
+		$(python_gen_cond_dep '
+		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}]
+	')
+	gui? (
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		sys-apps/dbus[X]
+		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 )
+
+DISTUTILS_ARGS=(
+	--no-update-icon-cache
+	--no-compile-schemas
+)
+
+EPYTEST_IGNORE=(
+	# Wants to use /tmp osinfo config?
+	tests/test_cli.py
+
+	# These seem to be essentially coverage tests
+	tests/test_checkprops.py
+)
+
+distutils_enable_tests pytest
+
+python_configure() {
+	esetup.py configure --default-graphics=spice
+}
+
+python_test() {
+	export VIRTINST_TEST_SUITE_FORCE_LIBOSINFO=0
+
+	epytest
+}
+
+python_install() {
+	esetup.py install
+}
+
+pkg_preinst() {
+	if use gui ; then
+		gnome2_pkg_preinst
+
+		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 -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 gui && 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]
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index b596c743f947..b2ec505d5c37 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,91 +1,105 @@
 # 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
 inherit gnome2 distutils-r1 optfeature
 
 DESCRIPTION="A graphical tool for administering virtual machines"
 HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
 
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 	EGIT_BRANCH="main"
+	SRC_URI=""
+	inherit git-r3
 else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gtk policykit sasl"
+IUSE="gui policykit sasl"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	$(python_gen_cond_dep '
+	>=sys-libs/libosinfo-0.2.10[introspection]
+		$(python_gen_cond_dep '
 		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? (
+	gui? (
 		gnome-base/dconf
 		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		sys-apps/dbus[X]
 		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 )
 
+DISTUTILS_ARGS=(
+	--no-update-icon-cache
+	--no-compile-schemas
+)
+
+EPYTEST_IGNORE=(
+	# Wants to use /tmp osinfo config?
+	tests/test_cli.py
+
+	# These seem to be essentially coverage tests
+	tests/test_checkprops.py
+)
+
 distutils_enable_tests pytest
 
 python_configure() {
 	esetup.py configure --default-graphics=spice
 }
 
-python_install() {
-	esetup.py install
+python_test() {
+	export VIRTINST_TEST_SUITE_FORCE_LIBOSINFO=0
+
+	epytest
 }
 
-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-	distutils-r1_src_install
+python_install() {
+	esetup.py install
 }
 
 pkg_preinst() {
-	if use gtk; then
+	if use gui ; 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
+	use gui && 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]
 }