Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/
Date: Tue, 04 May 2021 19:21:15
Message-Id: 1620156064.674b462afd20d8b7586262b19389914b6c15b911.mattst88@gentoo
1 commit: 674b462afd20d8b7586262b19389914b6c15b911
2 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com>
3 AuthorDate: Tue May 4 12:57:11 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 19:21:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674b462a
7
8 x11-libs/pango: Fix USE=-gtk-doc issues
9
10 This prevents pango from installing its own bundled gi-docgen when
11 it's not installed as a dependency, and it avoids trying to rename
12 a missing documentation directory.
13
14 Closes: https://bugs.gentoo.org/788091
15 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
16 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
17
18 x11-libs/pango/pango-1.48.4.ebuild | 8 +++++++-
19 1 file changed, 7 insertions(+), 1 deletion(-)
20
21 diff --git a/x11-libs/pango/pango-1.48.4.ebuild b/x11-libs/pango/pango-1.48.4.ebuild
22 index 53dc3cde0ba..e856f644a63 100644
23 --- a/x11-libs/pango/pango-1.48.4.ebuild
24 +++ b/x11-libs/pango/pango-1.48.4.ebuild
25 @@ -52,6 +52,9 @@ src_prepare() {
26
27 multilib_src_configure() {
28 local emesonargs=(
29 + # Never use gi-docgen subproject
30 + --wrap-mode nofallback
31 +
32 $(meson_feature sysprof)
33 -Dcairo=enabled
34 -Dfontconfig=enabled
35 @@ -78,7 +81,10 @@ multilib_src_install() {
36 }
37
38 multilib_src_install_all() {
39 - mv "${ED}"/usr/share/doc/{${PN},${P}} || die
40 + if use gtk-doc; then
41 + mv "${ED}"/usr/share/doc/{${PN},${P}} || die
42 + fi
43 + einstalldocs
44 }
45
46 pkg_postinst() {