From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/json-glib/
Date: Wed, 15 Sep 2021 11:45:48 +0000 (UTC) [thread overview]
Message-ID: <1631706324.c215affed692e945c950b49378b1e9fb50bf079a.leio@gentoo> (raw)
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
+}
next reply other threads:[~2021-09-15 11:45 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 11:45 Mart Raudsepp [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-21 17:16 [gentoo-commits] repo/gentoo:master commit in: dev-libs/json-glib/ Arthur Zamarin
2024-12-11 7:20 Bernard Cafarelli
2024-12-06 21:48 Bernard Cafarelli
2024-12-06 20:25 Sam James
2024-12-06 13:14 Bernard Cafarelli
2024-03-13 22:54 Mart Raudsepp
2024-03-12 21:50 Arthur Zamarin
2024-03-12 21:50 Arthur Zamarin
2024-03-12 21:49 Arthur Zamarin
2024-02-22 20:47 Arthur Zamarin
2024-02-22 20:47 Arthur Zamarin
2024-02-11 3:39 Sam James
2024-02-10 18:53 Arthur Zamarin
2023-09-16 18:19 Matt Turner
2023-04-30 23:50 Sam James
2022-10-29 23:21 Matt Turner
2022-01-24 19:21 Sam James
2022-01-24 19:21 Sam James
2022-01-24 14:49 Sam James
2022-01-24 14:45 Sam James
2022-01-20 9:42 Arthur Zamarin
2021-08-25 12:53 Pacho Ramos
2021-05-21 0:51 Yixun Lan
2021-04-15 1:33 Sam James
2021-04-15 0:13 Sam James
2021-04-14 22:07 Sam James
2021-03-15 18:06 Sergei Trofimovich
2021-03-13 3:51 Matt Turner
2020-12-28 15:47 Matt Turner
2020-11-08 3:51 Matt Turner
2018-12-30 16:18 Mikle Kolyada
2018-12-30 11:28 Mart Raudsepp
2018-12-30 10:16 Sergei Trofimovich
2018-12-28 3:46 Matt Turner
2018-12-05 15:32 Mart Raudsepp
2018-12-05 7:34 Mikle Kolyada
2018-12-05 7:07 Mikle Kolyada
2018-12-04 16:27 Mikle Kolyada
2018-11-04 14:16 Sergei Trofimovich
2018-09-18 9:46 Mart Raudsepp
2017-07-07 21:20 Mart Raudsepp
2017-07-07 10:12 Agostino Sarubbo
2017-06-12 10:07 Mart Raudsepp
2017-04-22 17:53 Tobias Klausmann
2017-04-12 10:10 Jeroen Roovers
2017-03-29 7:45 Michael Weber
2017-03-28 15:09 Michael Weber
2017-03-28 14:59 Michael Weber
2017-03-25 18:56 Mart Raudsepp
2017-03-23 3:51 Mart Raudsepp
2016-12-06 20:21 Markus Meier
2016-09-02 16:58 Patrice Clement
2016-07-30 10:50 Pacho Ramos
2016-07-30 10:50 Pacho Ramos
2016-07-30 9:34 Jeroen Roovers
2016-07-30 9:34 Jeroen Roovers
2016-06-08 19:50 Markus Meier
2016-04-03 12:42 Pacho Ramos
2016-03-19 14:12 Manuel Rüger
2016-03-19 14:12 Manuel Rüger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1631706324.c215affed692e945c950b49378b1e9fb50bf079a.leio@gentoo \
--to=leio@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox