[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/

[Matt Turner]

commit:     fb46cc4d59f36642a9a6e6b2dd2cbb0788e57241
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 16:37:37 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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
 }