[patch] fix.patch

0001-gui-libs-gtk-fix-doc-issues.patch (text/plain), 2.12 KB, created by David Michael on 2021-05-04 15:53:29 UTC

From 034eef359462e0e4759eab751cccfcbb6bdfeaa9 Mon Sep 17 00:00:00 2001
From: David Michael <[e-mail]>
Date: Tue, 4 May 2021 11:49:13 -0400
Subject: [PATCH] gui-libs/gtk: fix doc issues

The gtk4 directory won't exist for !gtk-doc, and the ${P} directory
will already exist from einstalldocs in meson_src_install, so the
mv would move the docs into a subdirectory instead of rename.

Also, instrospection requires graphene to use introspection.

Closes: https://bugs.gentoo.org/788082
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: David Michael <[e-mail]>
---
 gui-libs/gtk/gtk-4.2.0.ebuild | 6 ++++--
 gui-libs/gtk/gtk-4.2.1.ebuild | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gui-libs/gtk/gtk-4.2.0.ebuild b/gui-libs/gtk/gtk-4.2.0.ebuild
index 43ef1917efa..f1efc7ff9ac 100644
--- a/gui-libs/gtk/gtk-4.2.0.ebuild
+++ b/gui-libs/gtk/gtk-4.2.0.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
 	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1
+	>=media-libs/graphene-1.9.1[introspection?]
 	>=media-libs/libepoxy-1.4[X(+)?]
 	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
@@ -161,7 +161,9 @@ src_test() {
 
 src_install() {
 	meson_src_install
-	mv "${ED}"/usr/share/doc/{gtk4,${P}} || die
+	if use gtk-doc; then
+		mv "${ED}"/usr/share/doc/{gtk4/*,${P}/} || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/gui-libs/gtk/gtk-4.2.1.ebuild b/gui-libs/gtk/gtk-4.2.1.ebuild
index 43ef1917efa..f1efc7ff9ac 100644
--- a/gui-libs/gtk/gtk-4.2.1.ebuild
+++ b/gui-libs/gtk/gtk-4.2.1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
 	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1
+	>=media-libs/graphene-1.9.1[introspection?]
 	>=media-libs/libepoxy-1.4[X(+)?]
 	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
@@ -161,7 +161,9 @@ src_test() {
 
 src_install() {
 	meson_src_install
-	mv "${ED}"/usr/share/doc/{gtk4,${P}} || die
+	if use gtk-doc; then
+		mv "${ED}"/usr/share/doc/{gtk4/*,${P}/} || die
+	fi
 }
 
 pkg_preinst() {
-- 
2.26.3