gentoo resync : 20.03.2022

6 files changed, 32 insertions, 231 deletions

diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index ba9f5b78e628..4c3b2651201c 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,9 +1,6 @@
-DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a
-DIST virt-manager-3.1.0.tar.gz 2848420 BLAKE2B 729a16ee419cfc9f118e4a59336e961f17f38908ab3aaa3598c83bff3e8bca75b150f0f38b021c5ccb839a7c43e87f071859f68c2a81425715e236e14d0a7929 SHA512 185e34d8ebb2f9755bf9732bdafdbe9d0924d8c3b69758947252cce5deeac2042f473ba63673eea2bf36beb1f216a856938650f86e2c86eb5618e8f8522df53d
 DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec
-EBUILD virt-manager-2.2.1-r3.ebuild 2341 BLAKE2B a50426622743d3e21508c2dcebdd769e82bde419ca62a307951b106bc2fddd2a5fc9ba17e008909df90b91a4cd790f20791288865f4002ac54d17a6b6ee6c747 SHA512 b885bf0ff82234b087289dab5bf9131cef3300f02419f6683a622a765d311b4448170d7935cdc8c20b9de9d7aec0cf104202a858b63b08f250c78744fb8066c4
-EBUILD virt-manager-3.1.0.ebuild 2394 BLAKE2B 464dad98c7445fdbf6f57733a022d04064959ffd75a1f937f221f299638ca71cd360ea4451ca2e9186498d2dbab0e38d09255f74ca17cfd84fce131b5d45547e SHA512 e422eaeeba7cbcbabed620fbce812ea9101a48f5de7590f410d9897e220aa8d98e35f224bd8df9da57f67cf672651d3b45098d70e0022b0e3784f6a94d640c03
-EBUILD virt-manager-3.2.0-r1.ebuild 2568 BLAKE2B b0280a5538d50aa43d555a1452332bd4149c7b9590fd31f48c641431623ec7a9b74e432191413557e161f94e19d2c85e4d288b5324a654178e972793215267fd SHA512 6558a5da9539bd22657d24d9606b9e554cbcba2f7ce9289b2ce79ae3b45c23376222f7c76ebe15ea33c6d0827d508166630e93651763ff6f19642bda517f37a9
-EBUILD virt-manager-3.2.0.ebuild 2381 BLAKE2B 3aab7c01a1f2733f8b2b7f04922d0fa29daca8caf78dbd3b848a518bee41f9a8c974cbf3e93ef3e83001541d316194a820220915154dd17dea9c79c9fa4cda72 SHA512 8e4fe3b74e75317f39aeda0d63e4678b17bf3b5437c47cd0df6d9b45991440e1af0084c2f3ae80605fa82705300e417419472e0e3c3f58f385dc0371dac9e908
-EBUILD virt-manager-9999.ebuild 2590 BLAKE2B 246c472ea77bb6d838d0dd843bbc595348f595c9a066f87b140ea0332682948f5b88b83636ee565546e3d066c9b498ef83e912470cc32d181ee1a4a457078ca5 SHA512 0bf4bc5c207180e193a9be5b1e0cbf20cb94e542995dfdf22735503df5bed018cb6f3b55ad6c6ed9fe9b577b4238d2bc8f20e6325b87ab92c0aad5caaa2ee28c
+DIST virt-manager-4.0.0.tar.gz 3096236 BLAKE2B cf6ae282c6a351aab832a06387bf9daf9093c8cce3688cf0597f33d037db875638429a5320ffe28d8d860c83484ba5d6a02a8dc758c98914fa2af483552dede8 SHA512 115dc3feb499bb2f1f6df537bffe150d23b9b568fe8047d43577a138ff9b9180b10259dde3476136cdc85750576da1104e81a8c2f5761b4f2a89852467761f81
+EBUILD virt-manager-3.2.0-r1.ebuild 2566 BLAKE2B 9fdea4cfaa4d6cbe5f9b9000695ebd02c8e2c4d9d4ed0222a90690f977f72de63f997187295b13c110242b016003bf693ac032e2edc59eea2b3ea6fd81436336 SHA512 72f75dd06013f473c8620e726a49dde64b20137d1020f7bab0933c3b79ec515eeeae50b592661eba25a0ad57995b06c780dde7b49fe0407141e8cc8a1c0f25e7
+EBUILD virt-manager-4.0.0.ebuild 2601 BLAKE2B 6334b4ffd3b08326b68ce0889d0dba383194cff88127c4b82f9a65f6c34d41f89c68fd578ac3455a054e6fe96a86476cd1379afebfb0fb747322939a28e5469b SHA512 f3321aa7c2b71c18fdb0bf9091e0adf55204f0d47cf42d51daf2fa68f47458a1e291e1baf90db763aa2b20d1d15440072ffe667b48814be8f0aed24b59a85067
+EBUILD virt-manager-9999.ebuild 2588 BLAKE2B 07b24cdfd5a9e3947873f111ed7cee0ec9da6bee89a5dca22b25ba3d307b89f96e62cfa2b8e0599abb11a2bc8236c922505b12d1711db28068e556de0de0793b SHA512 31f75824006ad817ffdbebf7a565f267043a0056117fe29de6c65fe3b48600a6807c3b4a811a2fd1d5fb37bdeacef718d642bd907d80b9698a514773606b8ba7
 MISC metadata.xml 663 BLAKE2B a8a1b7a90bab2c9ea216c0acf8fc26ee70626dcfe6f171c878edc711f6134911f74282fe7f1feb7725ddcd9cf4d650d145cdfe4143d1e844f380ab9d516178c9 SHA512 f1144dba3cc161096d5564da8264c04552b733085d12a9ccce5f4d74c0a73fb528fe89cc4e709539300151b60e70d1e8a318f15b8474982a32da9360a98c520d
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
deleted file mode 100644
index a5da10c5d597..000000000000
--- a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_8 )
-DISTUTILS_SINGLE_IMPL=1
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	${PYTHON_DEPS}
-	app-cdr/cdrtools
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/requests[${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?]
-		net-misc/x11-ssh-askpass
-		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:4[introspection]
-		x11-libs/vte:2.91[introspection]
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-"
-
-DOCS=( README.md NEWS.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	esetup.py configure \
-		--default-graphics=spice
-}
-
-python_install() {
-	esetup.py install
-}
-
-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-	distutils-r1_src_install
-
-	python_fix_shebang "${ED}"/usr/share/virt-manager
-}
-
-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)
-	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"
-	fi
-}
-
-pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-3.1.0.ebuild b/app-emulation/virt-manager/virt-manager-3.1.0.ebuild
deleted file mode 100644
index cec598a0ff27..000000000000
--- a/app-emulation/virt-manager/virt-manager-3.1.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	${PYTHON_DEPS}
-	app-cdr/cdrtools
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_USEDEP}]
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/requests[${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?]
-		net-misc/x11-ssh-askpass
-		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:4[introspection]
-		x11-libs/vte:2.91[introspection]
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	dev-util/intltool
-"
-
-DOCS=( README.md NEWS.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	esetup.py configure \
-		--default-graphics=spice
-}
-
-python_install() {
-	esetup.py install
-}
-
-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-	distutils-r1_src_install
-
-	python_fix_shebang "${ED}"/usr/share/virt-manager
-}
-
-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)
-	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"
-	fi
-}
-
-pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-3.2.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-3.2.0-r1.ebuild
index 1bf166e0e62b..07b27acd931f 100644
--- a/app-emulation/virt-manager/virt-manager-3.2.0-r1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-3.2.0-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild b/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
index a17e294825f2..f0c76db800b0 100644
--- a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-4.0.0.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 
 DISTUTILS_USE_SETUPTOOLS=no
-inherit gnome2 distutils-r1
+inherit gnome2 distutils-r1 optfeature
 
 DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
+HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+	EGIT_BRANCH="master"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -40,27 +41,28 @@ RDEPEND="${PYTHON_DEPS}
 		gnome-base/dconf
 		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		net-misc/x11-ssh-askpass
+		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]
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	dev-util/intltool
-"
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils
+	dev-util/intltool"
 
 DOCS=( README.md NEWS.md )
 
+# Doesn't seem to play nicely in a sandboxed environment.
+RESTRICT="test"
+distutils_enable_tests pytest
+
 src_prepare() {
 	distutils-r1_src_prepare
 }
 
 python_configure() {
-	esetup.py configure \
-		--default-graphics=spice
+	esetup.py configure --default-graphics=spice
 }
 
 python_install() {
@@ -68,30 +70,27 @@ 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
-
-	python_fix_shebang "${ED}"/usr/share/virt-manager
 }
 
 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]
 }
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 2b7f150c0d93..0d98a47262d9 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-	EGIT_BRANCH="master"
+	EGIT_BRANCH="main"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"