From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E0A81382C5 for ; Mon, 15 Mar 2021 19:47:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37CFAE0828; Mon, 15 Mar 2021 19:47:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E5B0E0828 for ; Mon, 15 Mar 2021 19:47:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC111340CD7 for ; Mon, 15 Mar 2021 19:47:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1424A478 for ; Mon, 15 Mar 2021 19:47:05 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1615837617.cc20e6298b7217f4b0eab3c50078257fd77ebb1b.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: cc20e6298b7217f4b0eab3c50078257fd77ebb1b X-VCS-Branch: master Date: Mon, 15 Mar 2021 19:47:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 846be41c-a181-4e2c-8461-ca5258cf607d X-Archives-Hash: 0771f0f3cc6d5ffd6c67603c342e6b97 commit: cc20e6298b7217f4b0eab3c50078257fd77ebb1b Author: Michal Privoznik redhat com> AuthorDate: Sat Mar 13 07:45:16 2021 +0000 Commit: Joonas Niilola gentoo 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 redhat.com> Closes: https://github.com/gentoo/gentoo/pull/19909 Signed-off-by: Joonas Niilola 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