commit: faf351b8de3caa0f1222287482fa52b9a7baf36e Author: Lukas Schmelting <lschmelting <AT> posteo <DOT> com> AuthorDate: Sun Nov 2 09:19:58 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Nov 2 14:06:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf351b8
gui-libs/gtk: Add move condition to doc folders Closes: https://bugs.gentoo.org/965446 Co-authored-by: Nick Bowler <nbowler <AT> draconx.ca> Signed-off-by: Lukas Schmelting <lschmelting <AT> posteo.com> Part-of: https://github.com/gentoo/gentoo/pull/44429 Closes: https://github.com/gentoo/gentoo/pull/44429 Signed-off-by: Sam James <sam <AT> gentoo.org> gui-libs/gtk/gtk-4.18.6-r1.ebuild | 23 +++++++++++++++++++++-- gui-libs/gtk/gtk-4.20.1.ebuild | 23 +++++++++++++++++++++-- gui-libs/gtk/gtk-4.20.2.ebuild | 23 +++++++++++++++++++++-- 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/gui-libs/gtk/gtk-4.18.6-r1.ebuild b/gui-libs/gtk/gtk-4.18.6-r1.ebuild index 48156c8e1a10..7c60604d9c56 100644 --- a/gui-libs/gtk/gtk-4.18.6-r1.ebuild +++ b/gui-libs/gtk/gtk-4.18.6-r1.ebuild @@ -242,11 +242,30 @@ src_test() { } src_install() { + local i src + meson_src_install if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/{gtk4,gsk4,gdk4{,-wayland,-x11}} "${ED}"/usr/share/gtk-doc/html/ || die + mkdir -p "${ED}/usr/share/gtk-doc/html" || die + + for dir in gdk4 gtk4 gsk4; do + src="${ED}/usr/share/doc/${dir}" + test -d "${src}" || die "Expected documentation directory ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + done + + if use X; then + src="${ED}/usr/share/doc/gdk4-x11" + test -d "${src}" || die "Expected X11 documentation ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + fi + + if use wayland; then + src="${ED}/usr/share/doc/gdk4-wayland" + test -d "${src}" || die "Expected Wayland documentation ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + fi fi } diff --git a/gui-libs/gtk/gtk-4.20.1.ebuild b/gui-libs/gtk/gtk-4.20.1.ebuild index 5095297ab9a8..3c303243ce76 100644 --- a/gui-libs/gtk/gtk-4.20.1.ebuild +++ b/gui-libs/gtk/gtk-4.20.1.ebuild @@ -244,11 +244,30 @@ src_test() { } src_install() { + local i src + meson_src_install if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/{gtk4,gsk4,gdk4{,-wayland,-x11}} "${ED}"/usr/share/gtk-doc/html/ || die + mkdir -p "${ED}/usr/share/gtk-doc/html" || die + + for dir in gdk4 gtk4 gsk4; do + src="${ED}/usr/share/doc/${dir}" + test -d "${src}" || die "Expected documentation directory ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + done + + if use X; then + src="${ED}/usr/share/doc/gdk4-x11" + test -d "${src}" || die "Expected X11 documentation ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + fi + + if use wayland; then + src="${ED}/usr/share/doc/gdk4-wayland" + test -d "${src}" || die "Expected Wayland documentation ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + fi fi } diff --git a/gui-libs/gtk/gtk-4.20.2.ebuild b/gui-libs/gtk/gtk-4.20.2.ebuild index 5095297ab9a8..3c303243ce76 100644 --- a/gui-libs/gtk/gtk-4.20.2.ebuild +++ b/gui-libs/gtk/gtk-4.20.2.ebuild @@ -244,11 +244,30 @@ src_test() { } src_install() { + local i src + meson_src_install if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/{gtk4,gsk4,gdk4{,-wayland,-x11}} "${ED}"/usr/share/gtk-doc/html/ || die + mkdir -p "${ED}/usr/share/gtk-doc/html" || die + + for dir in gdk4 gtk4 gsk4; do + src="${ED}/usr/share/doc/${dir}" + test -d "${src}" || die "Expected documentation directory ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + done + + if use X; then + src="${ED}/usr/share/doc/gdk4-x11" + test -d "${src}" || die "Expected X11 documentation ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + fi + + if use wayland; then + src="${ED}/usr/share/doc/gdk4-wayland" + test -d "${src}" || die "Expected Wayland documentation ${src} not found" + mv -v "${src}" "${ED}/usr/share/gtk-doc/html" || die + fi fi }
