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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B91C0158030 for ; Fri, 3 Mar 2023 16:40:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C6D8E082B; Fri, 3 Mar 2023 16:40:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6F38E082B for ; Fri, 3 Mar 2023 16:40:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1291E33BF5B for ; Fri, 3 Mar 2023 16:40:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42BE0896 for ; Fri, 3 Mar 2023 16:40:23 +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: <1677861608.fb46cc4d59f36642a9a6e6b2dd2cbb0788e57241.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/waffle/waffle-1.7.1.ebuild media-libs/waffle/waffle-9999.ebuild X-VCS-Directories: media-libs/waffle/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: fb46cc4d59f36642a9a6e6b2dd2cbb0788e57241 X-VCS-Branch: master Date: Fri, 3 Mar 2023 16:40:23 +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: b284d6fc-bdeb-4263-a97a-8c1b03d369bc X-Archives-Hash: 0bd4ae5b03149b2c2ae1f904558f7987 commit: fb46cc4d59f36642a9a6e6b2dd2cbb0788e57241 Author: Matt Turner gentoo org> AuthorDate: Fri Mar 3 16:37:37 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Mar 3 16:40:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb46cc4d media-libs/waffle: Fix documentation installation path Closes: https://bugs.gentoo.org/852887 Signed-off-by: Matt Turner gentoo.org> media-libs/waffle/waffle-1.7.1.ebuild | 15 ++++++++++++--- media-libs/waffle/waffle-9999.ebuild | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/media-libs/waffle/waffle-1.7.1.ebuild b/media-libs/waffle/waffle-1.7.1.ebuild index 968c882955b5..9dd3bad563e3 100644 --- a/media-libs/waffle/waffle-1.7.1.ebuild +++ b/media-libs/waffle/waffle-1.7.1.ebuild @@ -58,8 +58,17 @@ multilib_src_configure() { multilib_src_install() { meson_src_install +} + +multilib_src_install_all() { + einstalldocs - ! use doc && rm -rf \ - "${D}"/usr/share/doc/waffle1 \ - "${D}"/usr/share/man/man{3,7} + rm -r \ + "${ED}"/usr/share/doc/${P} \ + "${ED}"/usr/share/doc/waffle1/release-notes || die + mv "${ED}"/usr/share/doc/{waffle1,${P}} || die + if ! use doc; then + rm -rf \ + "${ED}"/usr/share/man/man{3,7} || die + fi } diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild index 968c882955b5..9dd3bad563e3 100644 --- a/media-libs/waffle/waffle-9999.ebuild +++ b/media-libs/waffle/waffle-9999.ebuild @@ -58,8 +58,17 @@ multilib_src_configure() { multilib_src_install() { meson_src_install +} + +multilib_src_install_all() { + einstalldocs - ! use doc && rm -rf \ - "${D}"/usr/share/doc/waffle1 \ - "${D}"/usr/share/man/man{3,7} + rm -r \ + "${ED}"/usr/share/doc/${P} \ + "${ED}"/usr/share/doc/waffle1/release-notes || die + mv "${ED}"/usr/share/doc/{waffle1,${P}} || die + if ! use doc; then + rm -rf \ + "${ED}"/usr/share/man/man{3,7} || die + fi }