gentoo auto-resync : 14:11:2024 - 03:02:32

4 files changed, 18 insertions, 140 deletions

diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 064aa5a0a5fb..9f13b2535d59 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,5 +1,4 @@
 DIST virt-manager-4.1.0.tar.gz 3151412 BLAKE2B 1b4203be81bd7b82251225d691a4d9068f268e610f049bcadb96de5b539e964ca0b001f22f06ddd8266b58b079f60046f6d11942a1e4eadbc43f0607c46bbddd SHA512 725cb5bcbaebaafae417f95deffb4243ccdad769668cba6e1235f4607e2b29dbd099d2a9a3885981158f53ea854dd71cc29ed9d7557b2791161c13d34f2ef883
-EBUILD virt-manager-4.1.0-r1.ebuild 2735 BLAKE2B 898ce08337e24054e3add828396b8f637da1f8d0a4fc1b634e165ee0c5e96759f473c8cf0eeb224750ae1e001f1a1643788ce4c4f05e40b768cbbc0c2e0082a4 SHA512 ea2bcf8bd8a26fe76749e36a2ad0fea6747ac1bf2aa1b5ecc68a098eb9e89962537b3adfbcd51db31b7948da48c75ee9a9a9351e7fe37162c66e9c1acf6bb565
-EBUILD virt-manager-4.1.0.ebuild 2707 BLAKE2B 321964d595c73c1a25b587dc2106a7ff8186052f788ab40f364bbea96f239f58af22f8874946ab2cda0af73922d6eb0f8a89b721ec299afd173bcfa6caa06c99 SHA512 62eb6c96c6c40b649b2bd21e846087453b25ee810162cbd58585bc67d7030567bd04b4e57b1a41b90864e6827f1e2e7ed77f280521e4a95313c2874cf3ae78c1
-EBUILD virt-manager-9999.ebuild 2669 BLAKE2B 4e71c68abe8dbab7ebeb176822828fe67d5b4c56f2f64c4568632f3abe2a41f3ae076818ddb37490b55a6497f9e23bf0fb8e462bd1dabb2b3af51eba4abe05d2 SHA512 249eb104ffc1732856eb2a006336b967ec0d61a46803549d6b609dd84a8b8cd4834b5f598339b7aab752435b16d01c2dbc375a4237adde4b9557129ab1da0750
+EBUILD virt-manager-4.1.0-r1.ebuild 2721 BLAKE2B 2d2a1bde23307ac37f94c7b3a3eac3ee2d1a8cd425fce7cecaac2f79cb8c23aae81fd49f0d212cfcbc480732fba7ceb27211a34be4a336754c5efaf9f07e0997 SHA512 fe21b35ed5b09836a6b74208d14eb436ff1a4354ae1d31d50ea38b5c861c403be7aeb9ae5d05b0b9516c500a32f67372be75db4a4998ca78f57c5f05c0d0724f
+EBUILD virt-manager-9999.ebuild 2602 BLAKE2B d1dd8dc52bcc542a7ebd02eed656199bfa3893d7a287564a1d6d2f2a3f3b29a0ebb56da4b0ea274d6c792dc3a956441fef313732285c60136d1596c668a2162d SHA512 1f0fa7ea8419ead54c2d2f3a4ee0f353ec4c6d1daf0f72f7c871e078c3c5786715e4de51ff8ebba8090006ff11c1380f61551410adf321a3c10506a1e9a91255
 MISC metadata.xml 717 BLAKE2B 931cc0f16850272e3d61e4c3421768bd01fd98891d1049d540c36dfcc1cd3872c158796edf33479005fdf07fe449d251ef55562a832db8827e757202ed1b046e SHA512 e40d93e6febcbb48ea6178986736721a5c45bc92073a9108179fd437bb303ba1b6bf0adb6053e36f877b660c413404ef877aefe4d3ef2ec124d6b6cc808a411d
diff --git a/app-emulation/virt-manager/virt-manager-4.1.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-4.1.0-r1.ebuild
index bfd95c7acc4a..f2a81729e64f 100644
--- a/app-emulation/virt-manager/virt-manager-4.1.0-r1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-4.1.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 	inherit git-r3
 else
-	SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
diff --git a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
deleted file mode 100644
index 3614d2d36381..000000000000
--- a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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]
-	optfeature "virt-install --location ISO support" dev-libs/libisoburn
-}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 4fe9053bce7a..054d03a48f7f 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -4,9 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit gnome2 distutils-r1 optfeature
+inherit gnome2 python-single-r1 optfeature meson
 
 DESCRIPTION="A graphical tool for administering virtual machines"
 HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
@@ -17,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 	inherit git-r3
 else
-	SRC_URI="https://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
@@ -25,6 +23,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="gui policykit sasl"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="
 	${PYTHON_DEPS}
 	|| ( dev-libs/libisoburn app-cdr/cdrtools )
@@ -53,33 +53,18 @@ 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
-}
+src_configure() {
+	# While in the past we did allow test suite to run, any errors from
+	# test_cli.py were ignored. Since that's where like 90% of tests actually
+	# lives, just disable tests (and do not drag additional dependencies).
+	local emesonargs=(
+		-Dcompile-schemas=false
+		-Ddefault-graphics=spice
+		-Dtests=disabled
+		-Dupdate-icon-cache=false
+	)
 
-python_install() {
-	esetup.py install
+	meson_src_configure
 }
 
 pkg_preinst() {