commit: 46c9db3dd9982332b02b721a7186cdf071a1c958 Author: Michal Privoznik <michal.privoznik <AT> gmail <DOT> com> AuthorDate: Fri Feb 7 11:42:37 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 8 01:32:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c9db3d
app-emulation/libvirt: Rebase libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch The original patch doesn't apply cleanly anymore because of [1] which partially merged one change we were making. 1: https://gitlab.com/libvirt/libvirt/-/commit/2c79c424776f2116f0d70f4e1e08950dc16893ff Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40476 Signed-off-by: Sam James <sam <AT> gentoo.org> ...-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch | 29 ++++++++++++++++++++++ app-emulation/libvirt/libvirt-9999.ebuild | 4 +-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/app-emulation/libvirt/files/libvirt-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch b/app-emulation/libvirt/files/libvirt-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch new file mode 100644 index 000000000000..9797200d0a48 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-11.0.0-Fix-paths-in-libvirt-guests.sh.in.patch @@ -0,0 +1,29 @@ +From 879f22eea1ffac0053d7c3cc56cdcb03dd859bc7 Mon Sep 17 00:00:00 2001 +Message-ID: <879f22eea1ffac0053d7c3cc56cdcb03dd859bc7.1738928238.git.mpriv...@redhat.com> +From: Michal Privoznik <[email protected]> +Date: Fri, 31 Jan 2020 09:42:14 +0100 +Subject: [PATCH] Fix paths in libvirt-guests.sh.in + +Signed-off-by: Michal Privoznik <[email protected]> +--- + tools/libvirt-guests.sh.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in +index f2db1282ad..f2c9d9b465 100644 +--- a/tools/libvirt-guests.sh.in ++++ b/tools/libvirt-guests.sh.in +@@ -40,8 +40,8 @@ BYPASS_CACHE=0 + SYNC_TIME=0 + PERSISTENT_ONLY="default" + +-test -f "$initconfdir"/libvirt-guests && +- . "$initconfdir"/libvirt-guests ++test -f "$sysconfdir"/libvirt/libvirt-guests.conf && ++ . "$sysconfdir"/libvirt/libvirt-guests.conf + + LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests + VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests +-- +2.45.3 + diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index d87fbdaace17..38a8bb51cf88 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -156,7 +156,7 @@ PDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-11.0.0-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-10.7.0-fix-paths-for-apparmor.patch )
