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 9D140158092 for ; Wed, 15 Sep 2021 11:45:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B221E083D; Wed, 15 Sep 2021 11:45:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99E83E0839 for ; Wed, 15 Sep 2021 11:45:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90B6034316B for ; Wed, 15 Sep 2021 11:45:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8CF056 for ; Wed, 15 Sep 2021 11:45:48 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1631706324.c215affed692e945c950b49378b1e9fb50bf079a.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/json-glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/json-glib/json-glib-1.6.6-r1.ebuild dev-libs/json-glib/json-glib-1.6.6.ebuild X-VCS-Directories: dev-libs/json-glib/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: c215affed692e945c950b49378b1e9fb50bf079a X-VCS-Branch: master Date: Wed, 15 Sep 2021 11:45:48 +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: 2ba4960b-4efb-40bc-a737-f4dc724fbe47 X-Archives-Hash: b00ff53162d229bb1f29f36daded1256 commit: c215affed692e945c950b49378b1e9fb50bf079a Author: Mart Raudsepp gentoo org> AuthorDate: Wed Sep 15 10:46:36 2021 +0000 Commit: Mart Raudsepp gentoo 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 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