gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-libs/wayland: update USE=doc for mdbook

Browse Source 
Note that doxygen/xmlto/graphviz are still used, so this in addition

mdbook installs to wayland-1.25.0/html/en-US/book, while doxygen is
wayland-1.25.0/html/en-US/html. The latter feels a bit redundant with
the html dirs but well. Moved from Wayland/ to html/ given this is
more standard on Gentoo and avoids compression by default, Wayland
was also redundant with wayland-1.25.0.

At same time tidy doc deps a bit, no need to check these ancient bounds
at this point, nor USE=dot given we already depend on graphviz
(arguably doxygen should lose that USE=dot).

mdbook is rust, so this masks USE=doc on a few profiles. We *could*
keep the doxygen docs on other profiles but feel that it is not worth
the extra complications over developer-oriented docs.

Revbump in case users already had mdbook installed with USE=doc which
results in installing compressed fonts and some missing LICENSEs.

Closes: https://bugs.gentoo.org/971446
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2026-03-21 21:42:31 -04:00
parent cb9bd22a74
commit b6a5b980a4
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dev-libs/wayland/wayland-1.25.0.ebuild → dev-libs/wayland/wayland-1.25.0-r1.ebuild
View File

@@ -15,7 +15,7 @@ inherit meson-multilib
DESCRIPTION="Wayland protocol libraries"
HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
LICENSE="MIT"
LICENSE="MIT doc? ( Apache-2.0 OFL-1.1 )"
SLOT="0"
IUSE="doc test"
RESTRICT="!test? ( test )"
@@ -24,9 +24,10 @@ BDEPEND="
~dev-util/wayland-scanner-${PV}
virtual/pkgconfig
doc? (
>=app-text/doxygen-1.6[dot]
app-text/doxygen
app-text/mdbook
app-text/xmlto
>=media-gfx/graphviz-2.26.0
media-gfx/graphviz
)
"
DEPEND="
@@ -60,7 +61,7 @@ src_install() {
meson-multilib_src_install
if use doc; then
mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die
rmdir "${ED}"/usr/share/doc/"${PN}" || die
mv "${ED}"/usr/share/doc/{${PN}/Wayland,${PF}/html} || die
rmdir "${ED}"/usr/share/doc/${PN} || die
fi
}

13
dev-libs/wayland/wayland-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ inherit meson-multilib
DESCRIPTION="Wayland protocol libraries"
HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
LICENSE="MIT"
LICENSE="MIT doc? ( Apache-2.0 OFL-1.1 )"
SLOT="0"
IUSE="doc test"
RESTRICT="!test? ( test )"
@@ -24,9 +24,10 @@ BDEPEND="
~dev-util/wayland-scanner-${PV}
virtual/pkgconfig
doc? (
>=app-text/doxygen-1.6[dot]
app-text/doxygen
app-text/mdbook
app-text/xmlto
>=media-gfx/graphviz-2.26.0
media-gfx/graphviz
)
"
DEPEND="
@@ -60,7 +61,7 @@ src_install() {
meson-multilib_src_install
if use doc; then
mv "${ED}"/usr/share/doc/"${PN}"/* "${ED}"/usr/share/doc/"${PF}"/ || die
rmdir "${ED}"/usr/share/doc/"${PN}" || die
mv "${ED}"/usr/share/doc/{${PN}/Wayland,${PF}/html} || die
rmdir "${ED}"/usr/share/doc/${PN} || die
fi
}

4
profiles/arch/mips/package.use.mask
View File

@@ -1,6 +1,10 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Ionen Wolkens <ionen@gentoo.org> (2026-03-22)
# app-text/mdbook is not keyworded here
>=dev-libs/wayland-1.25.0 doc
# Ionen Wolkens <ionen@gentoo.org> (2026-03-16)
# media-libs/opencolorio is not keyworded here
media-video/ffmpeg opencolorio

4
profiles/features/wd40/package.use.mask
View File

@@ -1,6 +1,10 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Ionen Wolkens <ionen@gentoo.org> (2026-03-22)
# app-text/mdbook is written in rust
>=dev-libs/wayland-1.25.0 doc
# Alfred Wingate <parona@protonmail.com> (2026-02-18)
# Requires behave->cucumber-expressions->uv-build
dev-db/mycli test