From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E0DE158094 for ; Fri, 19 Aug 2022 23:48:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47F36E07C7; Fri, 19 Aug 2022 23:48:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D0BAE07C7 for ; Fri, 19 Aug 2022 23:48:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A53D3410A0 for ; Fri, 19 Aug 2022 23:48:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9314256D for ; Fri, 19 Aug 2022 23:48:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1660952822.c4dba51dff6bf892456ab503ed10ad2b8b657cb0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virt-manager/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virt-manager/virt-manager-4.1.0.ebuild app-emulation/virt-manager/virt-manager-9999.ebuild X-VCS-Directories: app-emulation/virt-manager/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c4dba51dff6bf892456ab503ed10ad2b8b657cb0 X-VCS-Branch: master Date: Fri, 19 Aug 2022 23:48:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b308581d-7a70-4446-aa89-006e2932d49c X-Archives-Hash: 39055c44f7b6ee5e7faec207bf2011bf commit: c4dba51dff6bf892456ab503ed10ad2b8b657cb0 Author: Sam James gentoo org> AuthorDate: Fri Aug 19 23:47:02 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Aug 19 23:47:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4dba51d app-emulation/virt-manager: enable tests, switch to USE=gui Switch to USE=gui per QA policy [0] [0] https://projects.gentoo.org/qa/policy-guide/use-flags.html#pg0802 Closes: https://bugs.gentoo.org/795912 Signed-off-by: Sam James gentoo.org> .../virt-manager/virt-manager-4.1.0.ebuild | 69 +++++++++++++--------- .../virt-manager/virt-manager-9999.ebuild | 69 +++++++++++++--------- 2 files changed, 84 insertions(+), 54 deletions(-) diff --git a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild index 1957dacecac0..bfa4c0d573fd 100644 --- a/app-emulation/virt-manager/virt-manager-4.1.0.ebuild +++ b/app-emulation/virt-manager/virt-manager-4.1.0.ebuild @@ -5,29 +5,39 @@ 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 - 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} - gtk? ( +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? ( >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] gnome-base/dconf net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] @@ -37,24 +47,27 @@ RDEPEND="${PYTHON_DEPS} 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/pygobject:3[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - >=sys-libs/libosinfo-0.2.10[introspection] - " +" DEPEND="${RDEPEND}" BDEPEND="dev-python/docutils" DOCS=( README.md NEWS.md ) # Doesn't seem to play nicely in a sandboxed environment. -RESTRICT="test" +#RESTRICT="test" + +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 @@ -62,17 +75,18 @@ 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 DISTUTILS_ARGS=( --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}" || die @@ -87,7 +101,8 @@ pkg_preinst() { } 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] } diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index 1957dacecac0..bfa4c0d573fd 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.ebuild @@ -5,29 +5,39 @@ 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 - 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} - gtk? ( +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? ( >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] gnome-base/dconf net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] @@ -37,24 +47,27 @@ RDEPEND="${PYTHON_DEPS} 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/pygobject:3[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - >=sys-libs/libosinfo-0.2.10[introspection] - " +" DEPEND="${RDEPEND}" BDEPEND="dev-python/docutils" DOCS=( README.md NEWS.md ) # Doesn't seem to play nicely in a sandboxed environment. -RESTRICT="test" +#RESTRICT="test" + +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 @@ -62,17 +75,18 @@ 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 DISTUTILS_ARGS=( --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}" || die @@ -87,7 +101,8 @@ pkg_preinst() { } 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] }