From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-emulation/libvirt/libvirt-9999.ebuild | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'app-emulation/libvirt/libvirt-9999.ebuild') diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index c2205b44c10b..0f0e3da1713f 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -125,7 +125,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch + "${FILESDIR}"/${PN}-6.2.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch ) @@ -218,7 +218,7 @@ src_prepare() { default # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die + cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ -i "${S}/libvirtd.init" || die "sed failed" @@ -323,20 +323,17 @@ my_src_install() { use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! - systemd_install_serviced \ - "${FILESDIR}"/libvirtd.service.conf libvirtd.service - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf newinitd "${S}/libvirtd.init" libvirtd newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd + newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc } -- cgit v1.2.3