commit: 777a43c0523eaf0fe1d502046c425fdfd7939890 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 12 16:56:16 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 12 16:57:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777a43c0
app-emulation/virt-manager: backport patch to avoid libxml2[python] It will automagically use libxml2[python] if available but it falls back to elementtree. Thanks to Pavel Hrdina for the pointer. Closes: https://bugs.gentoo.org/964164 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/virt-manager/Manifest | 1 + ...t-manager-9999.ebuild => virt-manager-5.1.0-r1.ebuild} | 15 ++++++++++++++- app-emulation/virt-manager/virt-manager-9999.ebuild | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest index c6f0a348a8d1..ac23350a43c6 100644 --- a/app-emulation/virt-manager/Manifest +++ b/app-emulation/virt-manager/Manifest @@ -1,4 +1,5 @@ DIST virt-manager-5.0.0.tar.xz 1466724 BLAKE2B b8b93587b1e1cdb398f33e4820aeaa9c1aecfbe26cd54597830fcbc009a51e70b0dd10b947b9392a1d3fdc5b28c19573a1d417b5748c38658b6e03725023bcfb SHA512 d0cb7eb844fc98ad29413717e5fa5834bc6f9f6cb6b9339b59c2721bb37a58f71280e3d2a04a64a6021614626329d76c92474f826bb1d9b7a9040b479f20d4e8 DIST virt-manager-5.0.0.tar.xz.asc 833 BLAKE2B f97127a4cb1c0c24c6627c5d8e1e510075df3ad492e716f0cf07e5f41b3226295da4d73f5cef5903a9bc5a3d7a6f34bd07e7b0f2e21e9d42997c117708de1ada SHA512 e0bec28ce61af5dd2a6895006d60e11dd7b384cd4fec305ebfbf05831864aeb334d212511d6f92827fe15f6d6dcab3ff1d13309afa686d3e8e76c6b354ffa494 +DIST virt-manager-5.1.0-elementtree-fallback.patch.xz 8500 BLAKE2B 795444bda6a3d04c9d9e65a63c3acc0c40eae457f460941ac6c871f1a3f78795eb2e7838add13b4378aa9880184c523f9422f73d6b31af603cefeec38bc374ba SHA512 b3a36edb21348072023b237996d6ded5528a6474e1d15c291c17b43eed58b6beb963d90fb026b069b2283535416c6d5416d21cb8dade61960fe3ee903e8856a3 DIST virt-manager-5.1.0.tar.xz 1489116 BLAKE2B 89c00eb1cb472e8ab1b97085404aefee00da4a0577f233945da36a44aeda53e11ee126d0357861cb0700b1b796f46775e3b233d9fa8ec77b058c8e286f498092 SHA512 6306500ae442a6ccb36d5f19bc26b0e32984ca145ee8d41a475e175ee4db6c0d253f0cf9d908c30e3269cf7aabdad4bbd30e84f3cd0477f233da1e43e0235e3c DIST virt-manager-5.1.0.tar.xz.asc 833 BLAKE2B 60f538b94c1d995c4b04be242f8bf659d1114afe4076b0bf515168f0998ab8df110731104795016b4530ead24783d804ecc887359c3021375ef637de9be0c588 SHA512 b74d8efcf2cec023b2044406c22aa4659e15e265f54a9d0f3501fa651dfd4a4f92f7a7ce690c7d7c0423dfbd01b1564a7e05be8fb4c9e990bfd2302ad2d53c3a diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-5.1.0-r1.ebuild similarity index 91% copy from app-emulation/virt-manager/virt-manager-9999.ebuild copy to app-emulation/virt-manager/virt-manager-5.1.0-r1.ebuild index 937882eb4cca..bebdb7609e4e 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-5.1.0-r1.ebuild @@ -17,6 +17,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI=" https://releases.pagure.org/${PN}/${P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-elementtree-fallback.patch.xz verify-sig? ( https://releases.pagure.org/${PN}/${P}.tar.xz.asc ) " KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" @@ -35,7 +36,6 @@ RDEPEND=" >=app-emulation/libvirt-glib-0.0.9[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}] @@ -66,6 +66,19 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/virt-manager.asc DOCS=( {DESIGN,NEWS,README}.md ) +PATCHES=( + "${WORKDIR}"/${P}-elementtree-fallback.patch +) + +src_unpack() { + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + + unpack ${P}.tar.xz + unpack ${P}-elementtree-fallback.patch.xz +} + src_configure() { local emesonargs=( # in upstream's order -Dupdate-icon-cache=false diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index 937882eb4cca..4d773dbb48ce 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.ebuild @@ -35,7 +35,6 @@ RDEPEND=" >=app-emulation/libvirt-glib-0.0.9[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}]
