commit:     3d8193892594bcf8c5dd275244bb0ba108f20e24
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Tue Jun  1 18:40:44 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 02:52:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d819389

x11-libs/gdk-pixbuf: Enable gi-docgen generated documentation

Closes: https://bugs.gentoo.org/779142
Closes: https://github.com/gentoo/gentoo/pull/21078
Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 profiles/arch/hppa/package.use.stable.mask   |  4 ++++
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/profiles/arch/hppa/package.use.stable.mask 
b/profiles/arch/hppa/package.use.stable.mask
index d4095150717..9b531ba794e 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <[email protected]> (2021-06-02)
+# dev-util/gi-docgen does not have stable keywords on hppa
+x11-libs/gdk-pixbuf gtk-doc
+
 # Sam James <[email protected]> (2021-06-01)
 # sys-apps/systemd is not stable on hppa
 sys-auth/pambase homed

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
index 00c3b161801..cd29c1da60d 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
@@ -30,8 +30,10 @@ BDEPEND="
        dev-libs/glib:2
        dev-libs/libxslt
        dev-util/glib-utils
-       gtk-doc? ( >=dev-util/gtk-doc-1.20
-               app-text/docbook-xml-dtd:4.3 )
+       gtk-doc? (
+               app-text/docbook-xml-dtd:4.3
+               dev-util/gi-docgen
+       )
        >=sys-devel/gettext-0.19.8
        virtual/pkgconfig
        >=dev-util/meson-0.55.3
@@ -71,7 +73,7 @@ multilib_src_configure() {
        )
        if multilib_is_native_abi; then
                emesonargs+=(
-                       $(meson_use gtk-doc gtk_docs)
+                       $(meson_use gtk-doc gtk_doc)
                        $(meson_feature introspection)
                        -Dman=true
                )
@@ -97,6 +99,15 @@ multilib_src_install() {
        meson_src_install
 }
 
+multilib_src_install_all() {
+       einstalldocs
+       if use gtk-doc; then
+               mkdir "${ED}"/usr/share/doc/${PF}/html || die
+               mv "${ED}"/usr/share/doc/{${PN}/,${PF}/html/} || die
+               mv "${ED}"/usr/share/doc/{gdk-pixdata/,${PF}/html/} || die
+       fi
+}
+
 pkg_preinst() {
        xdg_pkg_preinst
 

Reply via email to