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 46CC01382C5 for ; Tue, 4 May 2021 20:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97450E08F9; Tue, 4 May 2021 20:12:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C35CE08F9 for ; Tue, 4 May 2021 20:12:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CE6D33BEF4 for ; Tue, 4 May 2021 20:12:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE2A859C for ; Tue, 4 May 2021 20:12:38 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1620159136.29744120a6b62882342edc5400bf8b17600e52ed.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-libs/gtk/gtk-4.2.1.ebuild X-VCS-Directories: gui-libs/gtk/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 29744120a6b62882342edc5400bf8b17600e52ed X-VCS-Branch: master Date: Tue, 4 May 2021 20:12:38 +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: 32916d77-b336-4ec8-872f-4bedd8db405d X-Archives-Hash: 7d5d212198044b103f6dcba52fca1c6f commit: 29744120a6b62882342edc5400bf8b17600e52ed Author: Matt Turner gentoo org> AuthorDate: Tue May 4 14:35:53 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue May 4 20:12:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29744120 gui-libs/gtk: Install docs to html/ Suggested by Chris Mayo to avoid compressing included SVGs and fonts. Thanks for David Michael for the initial patch. Closes: https://bugs.gentoo.org/788082 Signed-off-by: Matt Turner gentoo.org> gui-libs/gtk/gtk-4.2.1.ebuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gui-libs/gtk/gtk-4.2.1.ebuild b/gui-libs/gtk/gtk-4.2.1.ebuild index 2ab650d33e3..0b4e9dad9c1 100644 --- a/gui-libs/gtk/gtk-4.2.1.ebuild +++ b/gui-libs/gtk/gtk-4.2.1.ebuild @@ -161,7 +161,19 @@ src_test() { src_install() { meson_src_install - mv "${ED}"/usr/share/doc/{gtk4,${P}} || die + + if use gtk-doc ; then + mkdir "${ED}"/usr/share/doc/${PF}/html || die + + local docdirs=( gdk4 gsk4 gtk4 ) + use wayland && docdirs+=( gdk4-wayland ) + use X && docdirs+=( gdk4-x11 ) + + local d + for d in "${docdirs[@]}"; do + mv "${ED}"/usr/share/doc/{${d},${PF}/html/} || die + done + fi } pkg_preinst() {