[gentoo-commits] repo/gentoo:master commit in: dev-libs/json-glib/

[Mart Raudsepp]

commit:     c215affed692e945c950b49378b1e9fb50bf079a
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 10:46:36 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 11:45:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c215affe

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 <AT> gentoo.org>

 .../{json-glib-1.6.6.ebuild => json-glib-1.6.6-r1.ebuild}  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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
similarity index 77%
rename from dev-libs/json-glib/json-glib-1.6.6.ebuild
rename to 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
+}