summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Privoznik <michal.privoznik@gmail.com>2023-05-09 10:54:26 +0300
committerSam James <sam@gentoo.org>2023-05-10 20:42:15 +0100
commite6ff88a9858323906a153346583ca80682ae6525 (patch)
tree71a6c35c82c31ced41ee0f11b5aff69ea40b18ef /app-emulation/libvirt/libvirt-9999.ebuild
parentnet-dialup/rp-pppoe: add 4.0 (diff)
downloadgentoo-e6ff88a9858323906a153346583ca80682ae6525.tar.gz
gentoo-e6ff88a9858323906a153346583ca80682ae6525.tar.bz2
gentoo-e6ff88a9858323906a153346583ca80682ae6525.zip
app-emulation/libvirt: Update live ebuild
The libvirt's upstream has moved and now in fact consider Gentoo's base layout. Firstly, new -Dinitconfdir option was invented (v9.3.0-33-g9850b37e39) and while it defaults to '/etc/conf.d' on Gentoo (v9.3.0-37-gd18572b4b7), let's just set it explicitly in src_configure() to accommodate the ${EPREFIX} variable. These upstream changes also mean, that some of our patches we apply on top of libvirt's git need rebasing, namely: - libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch, and - libvirt-8.2.0-do-not-use-sysconfig.patch Signed-off-by: Michal Privoznik <michal.privoznik@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/30964 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/libvirt/libvirt-9999.ebuild')
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 6ca1ae130822..3d66a605794d 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -142,8 +142,8 @@ PDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
- "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
+ "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+ "${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
)
@@ -291,6 +291,7 @@ src_configure() {
-Ddriver_vmware=enabled
--localstatedir="${EPREFIX}/var"
+ -Dinitconfdir="${EPREFIX}/etc/conf.d"
-Drunstatedir="${EPREFIX}/run"
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
)