From 4329be92c0c4f09383d249f04749d745b20adce0 Mon Sep 17 00:00:00 2001
From: Gerben Jan Dijkman <gjdijkman@outlook.com>
Date: Fri, 7 May 2021 11:26:20 +0200
Subject: [PATCH] Version Bump

---
 gui-libs/gtk/Manifest                         |  2 +-
 .../{gtk-4.2.0.ebuild => gtk-4.2.1.ebuild}    | 47 +++++++++++++------
 2 files changed, 33 insertions(+), 16 deletions(-)
 rename gui-libs/gtk/{gtk-4.2.0.ebuild => gtk-4.2.1.ebuild} (84%)

diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index dd8c303..7d29195 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1 +1 @@
-DIST gtk-4.2.0.tar.xz 25772584 BLAKE2B 38c29475050ff6d0aa41299201343d506e051387c44058f8d3e970470e49046bb11eae57d57d8d869577ca2d5f01da507edb3a87f79c98828ec938a0d87e6989 SHA512 12e825245b92f5dc652530c35b9a48a0bb284641d4128d054a19a35cb7814babe78bfbbdfd7fe3f2472d5028d078ae209a6da5d614b023c2b438223e4c5a04a0
+DIST gtk-4.2.1.tar.xz 25809520 BLAKE2B 63183950703375b092ce451be93d16d1149eb2095b5f304578a064422821546ae161235b46617647cd67a7d8898e2c3854d87bf31ede0cd6db2138d7e5c36c30 SHA512 a2721d6b9a72be481460081aedfbd713842cb5abdb24d810ec48e346342d0d91271f4ace321a9697214477ad4829d0b0ca67754ea316e719784f01c43f0fe732
diff --git a/gui-libs/gtk/gtk-4.2.0.ebuild b/gui-libs/gtk/gtk-4.2.1.ebuild
similarity index 84%
rename from gui-libs/gtk/gtk-4.2.0.ebuild
rename to gui-libs/gtk/gtk-4.2.1.ebuild
index bddfc9b..bb62046 100644
--- a/gui-libs/gtk/gtk-4.2.0.ebuild
+++ b/gui-libs/gtk/gtk-4.2.1.ebuild
@@ -5,23 +5,24 @@ EAPI=7
 
 inherit gnome.org gnome2-utils meson virtualx xdg
 
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
 
 LICENSE="LGPL-2+"
 SLOT="4"
 IUSE="aqua broadway cloudprint colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
+	gtk-doc? ( introspection )
 	xinerama? ( X )
 "
 
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm64"
 
 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?]
@@ -61,19 +62,11 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.7
 	sysprof? ( >=dev-util/sysprof-capture-3.38:4 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-	)
 	X? ( x11-base/xorg-proto )
 "
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
 RDEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-update-icon-cache-3
-	!<x11-libs/vte-0.31.0:2.90
 "
 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
 PDEPEND="
@@ -88,11 +81,18 @@ BDEPEND="
 	dev-libs/libxslt
 	>=dev-util/gdbus-codegen-2.48
 	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
 	gtk-doc? (
 		app-text/docbook-xml-dtd:4.3
-		>=dev-util/gtk-doc-1.33
+		dev-util/gi-docgen
+	)
+	test? (
+		dev-libs/glib:2
+		wayland? ( dev-libs/weston )
+
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
 	)
 "
 
@@ -136,7 +136,7 @@ src_configure() {
 }
 
 src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
 
 	if use X; then
 		einfo "Running tests under X"
@@ -159,6 +159,23 @@ src_test() {
 	fi
 }
 
+src_install() {
+	meson_src_install
+
+	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() {
 	gnome2_schemas_savelist
 }