summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2021-09-15 13:46:36 +0300
committerMart Raudsepp <leio@gentoo.org>2021-09-15 14:45:24 +0300
commitc215affed692e945c950b49378b1e9fb50bf079a (patch)
tree54abfe9bffaa2015d7c8741b6ea5d411189cc54c
parentx11-wm/blackbox: bump to 0.77 (diff)
downloadgentoo-c215affe.tar.gz
gentoo-c215affe.tar.bz2
gentoo-c215affe.zip
dev-libs/json-glib: fix USE=gtk-doc deps and handling
1.6.6, compared to 1.6.2, changed over to gi-docgen. Adjust deps and handling. Closes: https://bugs.gentoo.org/812125 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
-rw-r--r--dev-libs/json-glib/json-glib-1.6.6-r1.ebuild (renamed from dev-libs/json-glib/json-glib-1.6.6.ebuild)14
1 files changed, 13 insertions, 1 deletions
diff --git a/dev-libs/json-glib/json-glib-1.6.6.ebuild b/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
index 562120a52c5..173cbd9e95a 100644
--- a/dev-libs/json-glib/json-glib-1.6.6.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
@@ -23,7 +23,7 @@ BDEPEND="
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+ gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
>=sys-devel/gettext-0.18
virtual/pkgconfig
"
@@ -38,9 +38,21 @@ src_prepare() {
multilib_src_configure() {
local emesonargs=(
+ # Never use gi-docgen subproject
+ --wrap-mode nofallback
+
$(meson_native_use_feature introspection)
$(meson_native_use_feature gtk-doc gtk_doc)
$(meson_native_true man)
)
meson_src_configure
}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use gtk-doc ; then
+ # Move to location that <devhelp-41 will see, reconsider once devhelp-41 is stable
+ mkdir -p "${ED}"/usr/share/gtk-doc/html || die
+ mv "${ED}"/usr/share/doc/json-glib-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}