[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     cc20e6298b7217f4b0eab3c50078257fd77ebb1b
Author:     Michal Privoznik <mprivozn <AT> redhat <DOT> com>
AuthorDate: Sat Mar 13 07:45:16 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 19:46:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc20e629

app-emulation/libvirt: Specify docdir on configure cmd line

Up until very recently libvirt did not allow specifying docdir
via any (meson) configure option. That is why we patched
meson.build and changed docdir to point where we wanted it to
point. Well, this is changed with upstream commit of
v7.1.0-145-gee4a392dda. Therefore, don't patch the meson.build
file anymore and specify docdir like this:

  -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"

Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com>
Closes: https://github.com/gentoo/gentoo/pull/19909
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/libvirt/libvirt-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index d5252cac3d8..767580ad5f7 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -128,7 +128,6 @@ DEPEND="${BDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
 )
 
@@ -276,6 +275,7 @@ src_configure() {
 
 		--localstatedir="${EPREFIX}/var"
 		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
 	meson_src_configure